Bug 1449400 part 2 - Remove some dependencies from ServoStyleSet.h and add some random stuff to fix breakage. r=emilio

Some of the definitions are needed for the headers removal in
following patches.

MozReview-Commit-ID: BCj7U7RgBLj

--HG--
extra : rebase_source : e8e437f76c4db6ec930ea0481b6c1a38129a5477
extra : source : a1c42220e5070fa4beea438859ab0daec3f3fe7b
This commit is contained in:
Xidorn Quan 2018-03-29 22:15:46 +11:00
Родитель b4a5ee99b5
Коммит 3181988f2e
5 изменённых файлов: 26 добавлений и 8 удалений

Просмотреть файл

@ -11,6 +11,9 @@
#include "mozilla/ComputedStyle.h"
namespace mozilla {
namespace dom {
class Element;
} // namespace dom
namespace a11y {
class StyleInfo

Просмотреть файл

@ -11,13 +11,16 @@
#include "nsIMemoryReporter.h"
#include <algorithm>
#include "mozilla/ArenaObjectID.h"
#include "mozilla/Assertions.h"
#include "mozilla/RestyleLogging.h"
#include "mozilla/ServoStyleSet.h"
#include "mozilla/ServoTypes.h"
#include "mozilla/ServoUtils.h"
#include "mozilla/StyleComplexColor.h"
#include "mozilla/CachedInheritingStyles.h"
#include "nsCSSAnonBoxes.h"
#include "nsCSSPseudoElements.h"
// Includes nsStyleStructID.
#include "nsStyleStructFwd.h"
@ -66,13 +69,14 @@
#define NS_STYLE_CONTEXT_TYPE_SHIFT 37
class nsAtom;
enum nsChangeHint : uint32_t;
class nsIPresShell;
class nsPresContext;
class nsWindowSizes;
namespace mozilla {
enum class CSSPseudoElementType : uint8_t;
class ComputedStyle;
#define STYLE_STRUCT(name_) struct nsStyle##name_;
#include "nsStyleStructList.h"
#undef STYLE_STRUCT
extern "C" {
void Servo_ComputedStyle_AddRef(const mozilla::ComputedStyle* aStyle);
@ -80,6 +84,11 @@ extern "C" {
void Gecko_ComputedStyle_Destroy(mozilla::ComputedStyle*);
}
namespace mozilla {
enum class CSSPseudoElementType : uint8_t;
class ComputedStyle;
/**
* A ComputedStyle represents the computed style data for an element. The
* computed style data are stored in a set of structs (see nsStyleStruct.h) that

Просмотреть файл

@ -8,13 +8,11 @@
#define mozilla_ServoStyleSet_h
#include "mozilla/AtomArray.h"
#include "mozilla/EffectCompositor.h"
#include "mozilla/EnumeratedArray.h"
#include "mozilla/EventStates.h"
#include "mozilla/MediaFeatureChange.h"
#include "mozilla/PostTraversalTask.h"
#include "mozilla/ServoBindingTypes.h"
#include "mozilla/ServoElementSnapshot.h"
#include "mozilla/ServoBindings.h"
#include "mozilla/ServoUtils.h"
#include "mozilla/StyleSheetInlines.h"
@ -24,22 +22,28 @@
#include "nsCSSPseudoElements.h"
#include "nsCSSAnonBoxes.h"
#include "nsChangeHint.h"
#include "nsCoord.h"
#include "nsAtom.h"
#include "nsIMemoryReporter.h"
#include "nsTArray.h"
namespace mozilla {
namespace css {
class Rule;
} // namespace css
namespace dom {
class Element;
class ShadowRoot;
} // namespace dom
class CSSStyleSheet;
class ServoRestyleManager;
class ServoStyleSheet;
struct Keyframe;
class ServoElementSnapshotTable;
class ComputedStyle;
class ServoStyleRuleMap;
class StyleSheet;
} // namespace mozilla
class gfxFontFeatureValueSet;
class nsCSSCounterStyleRule;
class nsIContent;
class nsIDocument;
@ -471,7 +475,7 @@ public:
ComputedStyle* aNewParent,
ComputedStyle* aNewParentIgnoringFirstLine,
ComputedStyle* aNewLayoutParent,
Element* aElement);
dom::Element* aElement);
private:
friend class AutoSetInServoTraversal;

Просмотреть файл

@ -7,6 +7,7 @@
#ifndef mozilla_css_StreamLoader_h
#define mozilla_css_StreamLoader_h
#include "nsIStreamListener.h"
#include "nsString.h"
#include "mozilla/css/SheetLoadData.h"

Просмотреть файл

@ -29,6 +29,7 @@
#include "mozilla/ServoStyleSet.h"
#include "mozilla/StaticPrefs.h"
#include "mozilla/SyncRunnable.h"
#include "mozilla/SystemGroup.h"
#include "mozilla/Telemetry.h"
#include "mozilla/UniquePtrExtensions.h"
#include "mozilla/URLPreloader.h"