Clean-up: RenderElement.h includes headers it doesn't use

https://bugs.webkit.org/show_bug.cgi?id=173046

Reviewed by Andy Estes.

Source/WebCore:

Remove a couple of unneeded includes from RenderElement.h, and then clean up all the
follow-on compile errors that causes. Mostly, these errors are fixed by including the
correct headers at the point of use; otherwise, they're solved by forward-declaring types
and in one case by moving default constructors implementation to the cpp file from the header.

* css/parser/SizesAttributeParser.cpp:
* editing/cocoa/EditorCocoa.mm:
* platform/mac/PasteboardMac.mm:
* rendering/InlineIterator.h:
(WebCore::embedCharFromDirection):
* rendering/RenderBoxModelObject.h:
* rendering/RenderElement.cpp:
* rendering/RenderElement.h:
* rendering/RenderIterator.h:
* rendering/RenderLineBreak.cpp:
* rendering/RenderQuote.cpp:
* rendering/RenderText.h:
* rendering/SimpleLineLayoutPagination.cpp:
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
* rendering/TextAutoSizing.cpp:
* rendering/style/RenderStyle.cpp:
* rendering/style/RenderStyle.h:
* style/RenderTreeUpdater.cpp:
* style/StyleResolveForDocument.cpp:
* style/StyleTreeResolver.cpp:

Source/WebKit/mac:

* WebView/WebImmediateActionController.mm:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 58fa4df..9baa65f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2017-06-07  Jer Noble  <jer.noble@apple.com>
+
+        Clean-up: RenderElement.h includes headers it doesn't use
+        https://bugs.webkit.org/show_bug.cgi?id=173046
+
+        Reviewed by Andy Estes.
+
+        Remove a couple of unneeded includes from RenderElement.h, and then clean up all the
+        follow-on compile errors that causes. Mostly, these errors are fixed by including the
+        correct headers at the point of use; otherwise, they're solved by forward-declaring types
+        and in one case by moving default constructors implementation to the cpp file from the header.
+
+        * css/parser/SizesAttributeParser.cpp:
+        * editing/cocoa/EditorCocoa.mm:
+        * platform/mac/PasteboardMac.mm:
+        * rendering/InlineIterator.h:
+        (WebCore::embedCharFromDirection):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderElement.cpp:
+        * rendering/RenderElement.h:
+        * rendering/RenderIterator.h:
+        * rendering/RenderLineBreak.cpp:
+        * rendering/RenderQuote.cpp:
+        * rendering/RenderText.h:
+        * rendering/SimpleLineLayoutPagination.cpp:
+        * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+        * rendering/TextAutoSizing.cpp:
+        * rendering/style/RenderStyle.cpp:
+        * rendering/style/RenderStyle.h:
+        * style/RenderTreeUpdater.cpp:
+        * style/StyleResolveForDocument.cpp:
+        * style/StyleTreeResolver.cpp:
+
 2017-06-07  Youenn Fablet  <youenn@apple.com>
 
         Add WebRTC stats logging

diff --git a/Source/WebCore/css/parser/SizesAttributeParser.cpp b/Source/WebCore/css/parser/SizesAttributeParser.cpp
index 7b7969b..cff47cf 100644 (file)
--- a/Source/WebCore/css/parser/SizesAttributeParser.cpp
+++ b/Source/WebCore/css/parser/SizesAttributeParser.cpp
@@ -33,6 +33,7 @@
 #include "CSSPrimitiveValue.h"
 #include "CSSToLengthConversionData.h"
 #include "CSSTokenizer.h"
+#include "FontCascade.h"
 #include "MediaQueryEvaluator.h"
 #include "RenderView.h"
 #include "SizesCalcParser.h"

diff --git a/Source/WebCore/editing/cocoa/EditorCocoa.mm b/Source/WebCore/editing/cocoa/EditorCocoa.mm
index 7be63bc..682a50d 100644 (file)
--- a/Source/WebCore/editing/cocoa/EditorCocoa.mm
+++ b/Source/WebCore/editing/cocoa/EditorCocoa.mm
@@ -36,6 +36,7 @@
 #import "Editing.h"
 #import "EditingStyle.h"
 #import "EditorClient.h"
+#import "FontCascade.h"
 #import "Frame.h"
 #import "FrameSelection.h"
 #import "HTMLConverter.h"

diff --git a/Source/WebCore/platform/mac/PasteboardMac.mm b/Source/WebCore/platform/mac/PasteboardMac.mm
index 8ad4758..cd8ffde 100644 (file)
--- a/Source/WebCore/platform/mac/PasteboardMac.mm
+++ b/Source/WebCore/platform/mac/PasteboardMac.mm
@@ -48,6 +48,7 @@
 #import "Text.h"
 #import "URL.h"
 #import "WebCoreNSStringExtras.h"
+#import "WebCoreSystemInterface.h"
 #import "WebNSAttributedStringExtras.h"
 #import "markup.h"
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebCore/rendering/InlineIterator.h b/Source/WebCore/rendering/InlineIterator.h
index f366b3c..08eb2ab 100644 (file)
--- a/Source/WebCore/rendering/InlineIterator.h
+++ b/Source/WebCore/rendering/InlineIterator.h
@@ -141,7 +141,6 @@ inline bool operator!=(const InlineIterator& it1, const InlineIterator& it2)
 
 static inline UCharDirection embedCharFromDirection(TextDirection direction, EUnicodeBidi unicodeBidi)
 {
-    using namespace WTF::Unicode;
     if (unicodeBidi == Embed)
         return direction == RTL ? U_RIGHT_TO_LEFT_EMBEDDING : U_LEFT_TO_RIGHT_EMBEDDING;
     return direction == RTL ? U_RIGHT_TO_LEFT_OVERRIDE : U_LEFT_TO_RIGHT_OVERRIDE;

diff --git a/Source/WebCore/rendering/RenderBoxModelObject.h b/Source/WebCore/rendering/RenderBoxModelObject.h
index 31daedb..458d69f 100644 (file)
--- a/Source/WebCore/rendering/RenderBoxModelObject.h
+++ b/Source/WebCore/rendering/RenderBoxModelObject.h
@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include "FontBaseline.h"
 #include "LayoutRect.h"
 #include "RenderLayerModelObject.h"
 

diff --git a/Source/WebCore/rendering/RenderElement.cpp b/Source/WebCore/rendering/RenderElement.cpp
index f0e2c35..c9dc5d6 100644 (file)
--- a/Source/WebCore/rendering/RenderElement.cpp
+++ b/Source/WebCore/rendering/RenderElement.cpp
@@ -26,6 +26,7 @@
 #include "RenderElement.h"
 
 #include "AXObjectCache.h"
+#include "CSSAnimationController.h"
 #include "ContentData.h"
 #include "CursorList.h"
 #include "ElementChildIterator.h"

diff --git a/Source/WebCore/rendering/RenderElement.h b/Source/WebCore/rendering/RenderElement.h
index 8067218..2eb2afc 100644 (file)
--- a/Source/WebCore/rendering/RenderElement.h
+++ b/Source/WebCore/rendering/RenderElement.h
@@ -22,10 +22,8 @@
 
 #pragma once
 
-#include "CSSAnimationController.h"
 #include "LengthFunctions.h"
 #include "RenderObject.h"
-#include "StyleInheritedData.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/rendering/RenderIterator.h b/Source/WebCore/rendering/RenderIterator.h
index ba172e7..f055959 100644 (file)
--- a/Source/WebCore/rendering/RenderIterator.h
+++ b/Source/WebCore/rendering/RenderIterator.h
@@ -29,6 +29,8 @@
 
 namespace WebCore {
 
+class RenderText;
+
 template <typename T>
 class RenderIterator {
 public:

diff --git a/Source/WebCore/rendering/RenderLineBreak.cpp b/Source/WebCore/rendering/RenderLineBreak.cpp
index dced326..058b0fc 100644 (file)
--- a/Source/WebCore/rendering/RenderLineBreak.cpp
+++ b/Source/WebCore/rendering/RenderLineBreak.cpp
@@ -23,6 +23,7 @@
 #include "RenderLineBreak.h"
 
 #include "Document.h"
+#include "FontMetrics.h"
 #include "HTMLElement.h"
 #include "HTMLWBRElement.h"
 #include "InlineElementBox.h"

diff --git a/Source/WebCore/rendering/RenderQuote.cpp b/Source/WebCore/rendering/RenderQuote.cpp
index d7900df..2a83df7 100644 (file)
--- a/Source/WebCore/rendering/RenderQuote.cpp
+++ b/Source/WebCore/rendering/RenderQuote.cpp
@@ -26,6 +26,7 @@
 #include "QuotesData.h"
 #include "RenderTextFragment.h"
 #include "RenderView.h"
+#include <wtf/unicode/CharacterNames.h>
 
 using namespace WTF::Unicode;
 

diff --git a/Source/WebCore/rendering/RenderText.h b/Source/WebCore/rendering/RenderText.h
index 1411088..95340fb 100644 (file)
--- a/Source/WebCore/rendering/RenderText.h
+++ b/Source/WebCore/rendering/RenderText.h
@@ -31,6 +31,7 @@
 
 namespace WebCore {
 
+class Font;
 class InlineTextBox;
 struct GlyphOverflow;
 

diff --git a/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp b/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp
index 55f37cc..823e0c3 100644 (file)
--- a/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SimpleLineLayoutPagination.h"
 
+#include "FontCascade.h"
 #include "RenderBlockFlow.h"
 #include "SimpleLineLayout.h"
 #include "SimpleLineLayoutFunctions.h"

diff --git a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp
index cfd59c3..b9d0bb7 100644 (file)
--- a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SimpleLineLayoutTextFragmentIterator.h"
 
+#include "FontCascade.h"
 #include "Hyphenation.h"
 #include "RenderBlockFlow.h"
 #include "RenderChildIterator.h"

diff --git a/Source/WebCore/rendering/TextAutoSizing.cpp b/Source/WebCore/rendering/TextAutoSizing.cpp
index aaf71cb..2c1ed08 100644 (file)
--- a/Source/WebCore/rendering/TextAutoSizing.cpp
+++ b/Source/WebCore/rendering/TextAutoSizing.cpp
@@ -30,6 +30,7 @@
 
 #include "CSSFontSelector.h"
 #include "Document.h"
+#include "FontCascade.h"
 #include "Logging.h"
 #include "RenderListMarker.h"
 #include "RenderText.h"

diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index da17065..0be2d73 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -127,6 +127,9 @@ RenderStyle RenderStyle::createStyleInheritingFromPseudoStyle(const RenderStyle&
     return style;
 }
 
+RenderStyle::RenderStyle(RenderStyle&&) = default;
+RenderStyle& RenderStyle::operator=(RenderStyle&&) = default;
+
 RenderStyle::RenderStyle(CreateDefaultStyleTag)
     : m_boxData(StyleBoxData::create())
     , m_visualData(StyleVisualData::create())

diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
index e80f958..41fcb88 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.h
+++ b/Source/WebCore/rendering/style/RenderStyle.h
@@ -129,8 +129,8 @@ private:
     enum CreateDefaultStyleTag { CreateDefaultStyle };
 
 public:
-    RenderStyle(RenderStyle&&) = default;
-    RenderStyle& operator=(RenderStyle&&) = default;
+    RenderStyle(RenderStyle&&);
+    RenderStyle& operator=(RenderStyle&&);
     ~RenderStyle();
 
     RenderStyle replace(RenderStyle&&) WARN_UNUSED_RETURN;

diff --git a/Source/WebCore/style/RenderTreeUpdater.cpp b/Source/WebCore/style/RenderTreeUpdater.cpp
index 0835797..a24d0d2 100644 (file)
--- a/Source/WebCore/style/RenderTreeUpdater.cpp
+++ b/Source/WebCore/style/RenderTreeUpdater.cpp
@@ -27,6 +27,7 @@
 #include "RenderTreeUpdater.h"
 
 #include "AXObjectCache.h"
+#include "CSSAnimationController.h"
 #include "ComposedTreeAncestorIterator.h"
 #include "ComposedTreeIterator.h"
 #include "Document.h"

diff --git a/Source/WebCore/style/StyleResolveForDocument.cpp b/Source/WebCore/style/StyleResolveForDocument.cpp
index 6899e1d..d7a80a1 100644 (file)
--- a/Source/WebCore/style/StyleResolveForDocument.cpp
+++ b/Source/WebCore/style/StyleResolveForDocument.cpp
@@ -32,6 +32,7 @@
 #include "CSSFontSelector.h"
 #include "ConstantPropertyMap.h"
 #include "Document.h"
+#include "FontCascade.h"
 #include "Frame.h"
 #include "FrameView.h"
 #include "HTMLIFrameElement.h"

diff --git a/Source/WebCore/style/StyleTreeResolver.cpp b/Source/WebCore/style/StyleTreeResolver.cpp
index 72c7150..3a8a3d2 100644 (file)
--- a/Source/WebCore/style/StyleTreeResolver.cpp
+++ b/Source/WebCore/style/StyleTreeResolver.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "StyleTreeResolver.h"
 
+#include "CSSAnimationController.h"
 #include "CSSFontSelector.h"
 #include "ComposedTreeAncestorIterator.h"
 #include "ComposedTreeIterator.h"

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index d9c01ed..8a27da4 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2017-06-07  Jer Noble  <jer.noble@apple.com>
+
+        Clean-up: RenderElement.h includes headers it doesn't use
+        https://bugs.webkit.org/show_bug.cgi?id=173046
+
+        Reviewed by Andy Estes.
+
+        * WebView/WebImmediateActionController.mm:
+
 2017-06-07  Zalan Bujtas  <zalan@apple.com>
 
         [iOS WK1 WebThread] Do not call out to the main thread for device orientation.

diff --git a/Source/WebKit/mac/WebView/WebImmediateActionController.mm b/Source/WebKit/mac/WebView/WebImmediateActionController.mm
index 8f3d9d7..2f31cd5 100644 (file)
--- a/Source/WebKit/mac/WebView/WebImmediateActionController.mm
+++ b/Source/WebKit/mac/WebView/WebImmediateActionController.mm
@@ -42,6 +42,7 @@
 #import <WebCore/Editor.h>
 #import <WebCore/EventHandler.h>
 #import <WebCore/FocusController.h>
+#import <WebCore/FontMetrics.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GeometryUtilities.h>