Drop some unnecessary header includes
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jun 2016 15:43:14 +0000 (15:43 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jun 2016 15:43:14 +0000 (15:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158864

Reviewed by Alexey Proskuryakov.

Drop some unnecessary header includes to try and reduce build times.

* WebCore.xcodeproj/project.pbxproj:
* accessibility/AccessibilityList.cpp:
* css/CSSComputedStyleDeclaration.cpp:
* css/MediaQueryMatcher.cpp:
* css/StyleMedia.cpp:
* css/TransformFunctions.cpp:
* dom/NodeRenderStyle.h:
* dom/PseudoElement.h:
(isType): Deleted.
* html/HTMLTitleElement.cpp:
* html/shadow/MediaControlElementTypes.h:
* html/shadow/MediaControls.cpp:
* inspector/InspectorDOMAgent.h:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
* page/scrolling/AsyncScrollingCoordinator.cpp:
* page/scrolling/ScrollingCoordinator.h:
* rendering/BidiRun.h:
* rendering/BorderEdge.h:
* rendering/RenderElement.h:
* rendering/RenderObject.h:
(WebCore::AnnotatedRegionValue::operator==): Deleted.
(WebCore::AnnotatedRegionValue::operator!=): Deleted.
* rendering/RenderObjectEnums.h: Added.
* rendering/RenderTheme.h:
* rendering/SimpleLineLayoutFlowContents.h:
* rendering/SimpleLineLayoutTextFragmentIterator.h:
* rendering/TextPainter.h:
* rendering/style/RenderStyle.h:
(WebCore::pseudoElementRendererIsNeeded):
* rendering/style/ShapeValue.cpp:
* rendering/style/ShapeValue.h:
* style/ClassChangeInvalidation.cpp:
* style/ClassChangeInvalidation.h:
* style/InlineTextBoxStyle.h:
* style/StyleUpdate.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

34 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/accessibility/AccessibilityList.cpp
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/MediaQueryMatcher.cpp
Source/WebCore/css/StyleMedia.cpp
Source/WebCore/css/TransformFunctions.cpp
Source/WebCore/dom/NodeRenderStyle.h
Source/WebCore/dom/PseudoElement.h
Source/WebCore/html/HTMLTitleElement.cpp
Source/WebCore/html/shadow/MediaControlElementTypes.h
Source/WebCore/html/shadow/MediaControls.cpp
Source/WebCore/inspector/InspectorDOMAgent.h
Source/WebCore/inspector/InspectorLayerTreeAgent.h
Source/WebCore/inspector/InspectorPageAgent.cpp
Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
Source/WebCore/page/scrolling/ScrollingCoordinator.h
Source/WebCore/platform/efl/ScrollbarThemeEfl.cpp
Source/WebCore/rendering/BidiRun.h
Source/WebCore/rendering/BorderEdge.h
Source/WebCore/rendering/RenderElement.h
Source/WebCore/rendering/RenderObject.h
Source/WebCore/rendering/RenderObjectEnums.h [new file with mode: 0644]
Source/WebCore/rendering/RenderTheme.h
Source/WebCore/rendering/SimpleLineLayoutFlowContents.h
Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h
Source/WebCore/rendering/TextPainter.h
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/ShapeValue.cpp
Source/WebCore/rendering/style/ShapeValue.h
Source/WebCore/style/ClassChangeInvalidation.cpp
Source/WebCore/style/ClassChangeInvalidation.h
Source/WebCore/style/InlineTextBoxStyle.h
Source/WebCore/style/StyleUpdate.cpp

index 1da2719..3e4e94e 100644 (file)
@@ -1,3 +1,49 @@
+2016-06-17  Chris Dumez  <cdumez@apple.com>
+
+        Drop some unnecessary header includes
+        https://bugs.webkit.org/show_bug.cgi?id=158864
+
+        Reviewed by Alexey Proskuryakov.
+
+        Drop some unnecessary header includes to try and reduce build times.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * accessibility/AccessibilityList.cpp:
+        * css/CSSComputedStyleDeclaration.cpp:
+        * css/MediaQueryMatcher.cpp:
+        * css/StyleMedia.cpp:
+        * css/TransformFunctions.cpp:
+        * dom/NodeRenderStyle.h:
+        * dom/PseudoElement.h:
+        (isType): Deleted.
+        * html/HTMLTitleElement.cpp:
+        * html/shadow/MediaControlElementTypes.h:
+        * html/shadow/MediaControls.cpp:
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorLayerTreeAgent.h:
+        * inspector/InspectorPageAgent.cpp:
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        * page/scrolling/ScrollingCoordinator.h:
+        * rendering/BidiRun.h:
+        * rendering/BorderEdge.h:
+        * rendering/RenderElement.h:
+        * rendering/RenderObject.h:
+        (WebCore::AnnotatedRegionValue::operator==): Deleted.
+        (WebCore::AnnotatedRegionValue::operator!=): Deleted.
+        * rendering/RenderObjectEnums.h: Added.
+        * rendering/RenderTheme.h:
+        * rendering/SimpleLineLayoutFlowContents.h:
+        * rendering/SimpleLineLayoutTextFragmentIterator.h:
+        * rendering/TextPainter.h:
+        * rendering/style/RenderStyle.h:
+        (WebCore::pseudoElementRendererIsNeeded):
+        * rendering/style/ShapeValue.cpp:
+        * rendering/style/ShapeValue.h:
+        * style/ClassChangeInvalidation.cpp:
+        * style/ClassChangeInvalidation.h:
+        * style/InlineTextBoxStyle.h:
+        * style/StyleUpdate.cpp:
+
 2016-06-17  Andreas Kling  <akling@apple.com>
 
         [iOS] Throw away linked code when navigating to a new page.
index c526ba5..2403b6b 100644 (file)
                8372DB311A6780A800C697C5 /* DiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB301A6780A800C697C5 /* DiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; };
                8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */; };
+               838867351D13BA5F003697D0 /* RenderObjectEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 838867341D13BA59003697D0 /* RenderObjectEnums.h */; settings = {ATTRIBUTES = (Private, ); }; };
                838869EC1CE81EA300D16A9E /* JSTextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */; };
                839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */; };
                839AAFED1A0C0C8D00605F99 /* HTMLWBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */; };
                8372DB301A6780A800C697C5 /* DiagnosticLoggingResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticLoggingResultType.h; sourceTree = "<group>"; };
                8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilder.h; sourceTree = "<group>"; };
                8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBuilder.cpp; sourceTree = "<group>"; };
+               838867341D13BA59003697D0 /* RenderObjectEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectEnums.h; sourceTree = "<group>"; };
                838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextCustom.cpp; sourceTree = "<group>"; };
                839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLWBRElement.cpp; sourceTree = "<group>"; };
                839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLWBRElement.h; sourceTree = "<group>"; };
                                BC85F23C151915E000BC17BE /* RenderNamedFlowThread.h */,
                                BCEA4840097D93020094C9E4 /* RenderObject.cpp */,
                                BCEA4841097D93020094C9E4 /* RenderObject.h */,
+                               838867341D13BA59003697D0 /* RenderObjectEnums.h */,
                                BCFA930710333193007B25D1 /* RenderOverflow.h */,
                                A43BF59A1149292800C643CA /* RenderProgress.cpp */,
                                A43BF59B1149292800C643CA /* RenderProgress.h */,
                                7C74D43C1882400400E5ED57 /* UTextProviderUTF16.h in Headers */,
                                1FAFBF1915A5FA7400083A20 /* UTIUtilities.h in Headers */,
                                2E3BBF081162DA1100B9409A /* UUID.h in Headers */,
+                               838867351D13BA5F003697D0 /* RenderObjectEnums.h in Headers */,
                                F5A154281279534D00D0B0C0 /* ValidationMessage.h in Headers */,
                                F513A3EA15FF4841001526DB /* ValidationMessageClient.h in Headers */,
                                15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */,
index c78d364..aa194ea 100644 (file)
@@ -35,7 +35,6 @@
 #include "PseudoElement.h"
 #include "RenderListItem.h"
 #include "RenderObject.h"
-#include "RenderStyle.h"
 
 namespace WebCore {
     
index 67d9d57..b7d2691 100644 (file)
@@ -62,6 +62,7 @@
 #include "RenderBox.h"
 #include "RenderStyle.h"
 #include "SVGElement.h"
+#include "ShapeValue.h"
 #include "StyleInheritedData.h"
 #include "StyleProperties.h"
 #include "StylePropertyShorthand.h"
 #include "RenderGrid.h"
 #endif
 
-#if ENABLE(CSS_SHAPES)
-#include "ShapeValue.h"
-#endif
-
 #if ENABLE(DASHBOARD_SUPPORT)
 #include "DashboardRegion.h"
 #endif
index c6659f1..e059844 100644 (file)
@@ -28,6 +28,7 @@
 #include "MediaQueryList.h"
 #include "MediaQueryListListener.h"
 #include "NodeRenderStyle.h"
+#include "RenderElement.h"
 #include "StyleResolver.h"
 
 namespace WebCore {
index 7cdd271..76c7905 100644 (file)
@@ -32,6 +32,7 @@
 #include "MediaList.h"
 #include "MediaQueryEvaluator.h"
 #include "NodeRenderStyle.h"
+#include "RenderElement.h"
 #include "StyleResolver.h"
 
 namespace WebCore {
index 1edbc26..61958bc 100644 (file)
@@ -38,7 +38,6 @@
 #include "Matrix3DTransformOperation.h"
 #include "MatrixTransformOperation.h"
 #include "PerspectiveTransformOperation.h"
-#include "RenderStyle.h"
 #include "RotateTransformOperation.h"
 #include "ScaleTransformOperation.h"
 #include "SkewTransformOperation.h"
index 89c8877..636e9e5 100644 (file)
@@ -25,7 +25,6 @@
 #ifndef NodeRenderStyle_h
 #define NodeRenderStyle_h
 
-#include "RenderElement.h"
 #include "RenderObject.h"
 #include "RenderStyle.h"
 #include "Node.h"
index 422c9f1..0c660d5 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "Element.h"
 #include "Event.h"
-#include "RenderStyle.h"
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -72,11 +71,6 @@ private:
 
 const QualifiedName& pseudoElementTagName();
 
-inline bool pseudoElementRendererIsNeeded(const RenderStyle* style)
-{
-    return style && style->display() != NONE && (style->contentData() || style->hasFlowFrom());
-}
-
 } // namespace WebCore
 
 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::PseudoElement)
index e26fa6e..d1473ce 100644 (file)
@@ -26,6 +26,7 @@
 #include "Document.h"
 #include "HTMLNames.h"
 #include "NodeRenderStyle.h"
+#include "RenderElement.h"
 #include "RenderStyle.h"
 #include "StyleInheritedData.h"
 #include "StyleResolver.h"
index c1f53fd..1cde5ce 100644 (file)
@@ -36,7 +36,7 @@
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
 #include "MediaControllerInterface.h"
-#include "RenderBlock.h"
+#include "RenderObject.h"
 
 namespace WebCore {
 
index 436ea1d..82a5098 100644 (file)
@@ -32,6 +32,7 @@
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
 #include "Page.h"
+#include "RenderElement.h"
 #include "Settings.h"
 
 namespace WebCore {
index 1ddcd34..3744cb1 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "EventTarget.h"
 #include "InspectorWebAgentBase.h"
-#include "RenderLayer.h"
 #include "Timer.h"
 #include <inspector/InspectorBackendDispatchers.h>
 #include <inspector/InspectorFrontendDispatchers.h>
@@ -49,6 +48,7 @@ class InjectedScriptManager;
 }
 
 namespace JSC {
+class ExecState;
 class JSValue;
 }
 
@@ -61,6 +61,8 @@ class DOMEditor;
 class Document;
 class Element;
 class Event;
+class FloatQuad;
+class Frame;
 class InspectorHistory;
 class InspectorOverlay;
 class InspectorPageAgent;
@@ -68,6 +70,7 @@ class HitTestResult;
 class HTMLElement;
 class NameNodeMap;
 class Node;
+class PseudoElement;
 class RevalidateStyleAttributeTask;
 class ShadowRoot;
 
index 32a4cbc..1b54d46 100644 (file)
@@ -30,7 +30,6 @@
 #define InspectorLayerTreeAgent_h
 
 #include "InspectorWebAgentBase.h"
-#include "RenderLayer.h"
 #include <inspector/InspectorBackendDispatchers.h>
 #include <inspector/InspectorFrontendDispatchers.h>
 #include <inspector/InspectorProtocolObjects.h>
 
 namespace WebCore {
 
+class IntRect;
+class Node;
+class PseudoElement;
+class RenderElement;
+class RenderLayer;
+
 typedef String ErrorString;
 
 class InspectorLayerTreeAgent final : public InspectorAgentBase, public Inspector::LayerTreeBackendDispatcherHandler {
index f78344d..193b598 100644 (file)
@@ -62,6 +62,7 @@
 #include "MainFrame.h"
 #include "MemoryCache.h"
 #include "Page.h"
+#include "RenderObject.h"
 #include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index 0bb8416..34a74c8 100644 (file)
@@ -28,6 +28,7 @@
 #if ENABLE(ASYNC_SCROLLING)
 #include "AsyncScrollingCoordinator.h"
 
+#include "Document.h"
 #include "EditorClient.h"
 #include "Frame.h"
 #include "FrameView.h"
index aa7c6dc..120c4f9 100644 (file)
@@ -30,9 +30,9 @@
 #include "IntRect.h"
 #include "LayoutRect.h"
 #include "PlatformWheelEvent.h"
-#include "RenderObject.h"
 #include "ScrollTypes.h"
 #include <wtf/Forward.h>
+#include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/TypeCasts.h>
 
 #if ENABLE(ASYNC_SCROLLING)
index d2c1773..6847387 100644 (file)
@@ -29,6 +29,7 @@
 #include "config.h"
 #include "ScrollbarThemeEfl.h"
 
+#include "Frame.h"
 #include "FrameView.h"
 #include "NotImplemented.h"
 #include "Page.h"
index da3ec51..9dd9881 100644 (file)
 
 #include <wtf/StdLibExtras.h>
 #include "BidiResolver.h"
-#include "RenderText.h"
 
 namespace WebCore {
 
 class BidiContext;
 class InlineBox;
+class RenderObject;
 
 struct BidiRun : BidiCharacterRun {
     BidiRun(int start, int stop, RenderObject&, BidiContext*, UCharDirection);
index 6bcdedf..be05a4b 100644 (file)
 #ifndef BorderEdge_h
 #define BorderEdge_h
 
-#include "RenderObject.h"
+#include "Color.h"
+#include "LayoutUnit.h"
+#include "RenderObjectEnums.h"
+#include "RenderStyleConstants.h"
 
 namespace WebCore {
 
 typedef unsigned BorderEdgeFlags;
 
 class RenderStyle;
-class LayoutUnit;
 
 class BorderEdge {
 public:
index b726531..b63aa6e 100644 (file)
@@ -24,6 +24,7 @@
 #define RenderElement_h
 
 #include "AnimationController.h"
+#include "LengthFunctions.h"
 #include "RenderObject.h"
 #include "StyleInheritedData.h"
 
index 6314a06..e4fc1cd 100644 (file)
@@ -32,6 +32,7 @@
 #include "Frame.h"
 #include "LayoutRect.h"
 #include "PaintPhase.h"
+#include "RenderObjectEnums.h"
 #include "RenderStyle.h"
 #include "ScrollBehavior.h"
 #include "StyleImage.h"
@@ -73,48 +74,6 @@ class SelectionRect;
 
 struct PaintInfo;
 
-enum CursorDirective {
-    SetCursorBasedOnStyle,
-    SetCursor,
-    DoNotSetCursor
-};
-
-enum HitTestFilter {
-    HitTestAll,
-    HitTestSelf,
-    HitTestDescendants
-};
-
-enum HitTestAction {
-    HitTestBlockBackground,
-    HitTestChildBlockBackground,
-    HitTestChildBlockBackgrounds,
-    HitTestFloat,
-    HitTestForeground
-};
-
-// Sides used when drawing borders and outlines. The values should run clockwise from top.
-enum BoxSide {
-    BSTop,
-    BSRight,
-    BSBottom,
-    BSLeft
-};
-
-enum MarkingBehavior {
-    MarkOnlyThis,
-    MarkContainingBlockChain,
-};
-
-enum class ScheduleRelayout { No, Yes };
-
-enum MapCoordinatesMode {
-    IsFixed             = 1 << 0,
-    UseTransforms       = 1 << 1,
-    ApplyContainerFlip  = 1 << 2
-};
-typedef unsigned MapCoordinatesFlags;
-
 #if PLATFORM(IOS)
 const int caretWidth = 2; // This value should be kept in sync with UIKit. See <rdar://problem/15580601>.
 #else
diff --git a/Source/WebCore/rendering/RenderObjectEnums.h b/Source/WebCore/rendering/RenderObjectEnums.h
new file mode 100644 (file)
index 0000000..17c436c
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
+ *           (C) 2000 Antti Koivisto (koivisto@kde.org)
+ *           (C) 2000 Dirk Mueller (mueller@kde.org)
+ *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#pragma once
+
+namespace WebCore {
+
+enum CursorDirective {
+    SetCursorBasedOnStyle,
+    SetCursor,
+    DoNotSetCursor
+};
+
+enum HitTestFilter {
+    HitTestAll,
+    HitTestSelf,
+    HitTestDescendants
+};
+
+enum HitTestAction {
+    HitTestBlockBackground,
+    HitTestChildBlockBackground,
+    HitTestChildBlockBackgrounds,
+    HitTestFloat,
+    HitTestForeground
+};
+
+// Sides used when drawing borders and outlines. The values should run clockwise from top.
+enum BoxSide {
+    BSTop,
+    BSRight,
+    BSBottom,
+    BSLeft
+};
+
+enum MarkingBehavior {
+    MarkOnlyThis,
+    MarkContainingBlockChain,
+};
+
+enum class ScheduleRelayout { No, Yes };
+
+enum MapCoordinatesMode {
+    IsFixed             = 1 << 0,
+    UseTransforms       = 1 << 1,
+    ApplyContainerFlip  = 1 << 2
+};
+typedef unsigned MapCoordinatesFlags;
+
+}
index 33b09b5..16f0027 100644 (file)
@@ -33,7 +33,6 @@
 #endif
 #include "PaintInfo.h"
 #include "PopupMenuStyle.h"
-#include "RenderObject.h"
 #include "ScrollTypes.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -45,14 +44,18 @@ class Element;
 class FileList;
 class HTMLInputElement;
 class Icon;
+class Page;
 class PopupMenu;
 class RenderAttachment;
+class RenderBox;
 class RenderMenuList;
 #if ENABLE(METER_ELEMENT)
 class RenderMeter;
 #endif
+class RenderObject;
 class RenderProgress;
 class RenderSnapshottedPlugIn;
+class StyleResolver;
 
 class RenderTheme : public RefCounted<RenderTheme> {
 protected:
index b3832c9..96bb302 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef SimpleLineLayoutFlowContents_h
 #define SimpleLineLayoutFlowContents_h
 
-#include "RenderText.h"
+#include "RenderObject.h"
 
 namespace WebCore {
 class RenderBlockFlow;
index 4821dd9..c7906c1 100644 (file)
 #define SimpleLineLayoutTextFragmentIterator_h
 
 #include "RenderLineBreak.h"
-#include "RenderStyle.h"
 #include "SimpleLineLayoutFlowContents.h"
 #include "TextBreakIterator.h"
 #include "break_lines.h"
 
 namespace WebCore {
+
 class RenderBlockFlow;
+class RenderStyle;
 
 namespace SimpleLineLayout {
 
index bce548d..e4b5b18 100644 (file)
 #define TextPainter_h
 
 #include "AffineTransform.h"
-#include "RenderText.h"
+#include "FloatRect.h"
+#include "ShadowData.h"
 #include "TextFlags.h"
 #include "TextPaintStyle.h"
+#include <wtf/text/AtomicString.h>
 
 namespace WebCore {
 
+class FontCascade;
 class RenderCombineText;
+class TextRun;
 
 struct TextPaintStyle;
 
index 6933171..3ea3318 100644 (file)
 #include "CSSPrimitiveValue.h"
 #include "CSSPropertyNames.h"
 #include "Color.h"
-#include "ColorSpace.h"
 #include "CounterDirectives.h"
 #include "DataRef.h"
-#include "FontBaseline.h"
 #include "FontDescription.h"
 #include "GraphicsTypes.h"
 #include "Length.h"
 #include "LengthBox.h"
-#include "LengthFunctions.h"
 #include "LengthPoint.h"
 #include "LengthSize.h"
 #include "LineClampValue.h"
 #include "NinePieceImage.h"
-#include "OutlineValue.h"
 #include "Pagination.h"
 #include "RenderStyleConstants.h"
 #include "RoundedRect.h"
@@ -57,7 +53,6 @@
 #include "StyleDeprecatedFlexibleBoxData.h"
 #include "StyleFilterData.h"
 #include "StyleFlexibleBoxData.h"
-#include "StyleInheritedData.h"
 #include "StyleMarqueeData.h"
 #include "StyleMultiColData.h"
 #include "StyleRareInheritedData.h"
@@ -73,7 +68,6 @@
 #include <memory>
 #include <wtf/Forward.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/RefCounted.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
 
@@ -2351,6 +2345,11 @@ inline void RenderStyle::setHasPseudoStyles(PseudoIdSet pseudoIdSet)
     noninherited_flags.setHasPseudoStyles(pseudoIdSet);
 }
 
+inline bool pseudoElementRendererIsNeeded(const RenderStyle* style)
+{
+    return style && style->display() != NONE && (style->contentData() || style->hasFlowFrom());
+}
+
 } // namespace WebCore
 
 #endif // RenderStyle_h
index 2eef760..c7f8521 100644 (file)
@@ -24,6 +24,8 @@
  */
 
 #include "config.h"
+
+#if ENABLE(CSS_SHAPES)
 #include "ShapeValue.h"
 
 #include "CachedImage.h"
@@ -62,3 +64,5 @@ bool ShapeValue::operator==(const ShapeValue& other) const
 
 
 } // namespace WebCore
+
+#endif // ENABLE(CSS_SHAPES)
index f54678d..9d62d5d 100644 (file)
@@ -27,8 +27,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef ShapeValue_h
-#define ShapeValue_h
+#pragma once
+
+#if ENABLE(CSS_SHAPES)
 
 #include "BasicShapes.h"
 #include "CSSValueKeywords.h"
@@ -113,4 +114,4 @@ private:
 
 }
 
-#endif
+#endif // ENABLE(CSS_SHAPES)
index b47ad20..1830a0f 100644 (file)
@@ -30,6 +30,8 @@
 #include "ElementChildIterator.h"
 #include "SpaceSplitString.h"
 #include "StyleInvalidationAnalysis.h"
+#include "StyleResolver.h"
+#include <wtf/BitVector.h>
 
 namespace WebCore {
 namespace Style {
index cd81f35..6d44b18 100644 (file)
 #ifndef ClassChangeInvalidation_h
 #define ClassChangeInvalidation_h
 
-#include "Document.h"
 #include "Element.h"
-#include "StyleResolver.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class DocumentRuleSets;
+class RuleSet;
 class SpaceSplitString;
 
 namespace Style {
index 8030705..1206cbd 100644 (file)
 #define InlineTextBoxStyle_h
 
 #include "FontCascade.h"
-#include "RenderStyle.h"
+#include "RenderStyleConstants.h"
 
 namespace WebCore {
     
 class InlineTextBox;
+class RenderStyle;
 
 inline float textDecorationStrokeThickness(float fontSize)
 {
index 66dcb61..9b2cecb 100644 (file)
@@ -30,6 +30,7 @@
 #include "Document.h"
 #include "Element.h"
 #include "NodeRenderStyle.h"
+#include "RenderElement.h"
 #include "Text.h"
 
 namespace WebCore {