Diff
Modified: trunk/Source/WebCore/ChangeLog (217892 => 217893)
--- trunk/Source/WebCore/ChangeLog 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/ChangeLog 2017-06-07 17:44:45 UTC (rev 217893)
@@ -1,3 +1,36 @@
+2017-06-07 Jer Noble <[email protected]>
+
+ 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 <[email protected]>
Add WebRTC stats logging
Modified: trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp (217892 => 217893)
--- trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -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"
Modified: trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm (217892 => 217893)
--- trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-06-07 17:44:45 UTC (rev 217893)
@@ -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"
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (217892 => 217893)
--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2017-06-07 17:44:45 UTC (rev 217893)
@@ -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>
Modified: trunk/Source/WebCore/rendering/InlineIterator.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/InlineIterator.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/InlineIterator.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -141,7 +141,6 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -23,6 +23,7 @@
#pragma once
+#include "FontBaseline.h"
#include "LayoutRect.h"
#include "RenderLayerModelObject.h"
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -26,6 +26,7 @@
#include "RenderElement.h"
#include "AXObjectCache.h"
+#include "CSSAnimationController.h"
#include "ContentData.h"
#include "CursorList.h"
#include "ElementChildIterator.h"
Modified: trunk/Source/WebCore/rendering/RenderElement.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderElement.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -22,10 +22,8 @@
#pragma once
-#include "CSSAnimationController.h"
#include "LengthFunctions.h"
#include "RenderObject.h"
-#include "StyleInheritedData.h"
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderIterator.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderIterator.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderIterator.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -29,6 +29,8 @@
namespace WebCore {
+class RenderText;
+
template <typename T>
class RenderIterator {
public:
Modified: trunk/Source/WebCore/rendering/RenderLineBreak.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -23,6 +23,7 @@
#include "RenderLineBreak.h"
#include "Document.h"
+#include "FontMetrics.h"
#include "HTMLElement.h"
#include "HTMLWBRElement.h"
#include "InlineElementBox.h"
Modified: trunk/Source/WebCore/rendering/RenderQuote.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderQuote.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderQuote.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -26,6 +26,7 @@
#include "QuotesData.h"
#include "RenderTextFragment.h"
#include "RenderView.h"
+#include <wtf/unicode/CharacterNames.h>
using namespace WTF::Unicode;
Modified: trunk/Source/WebCore/rendering/RenderText.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/RenderText.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/RenderText.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -31,6 +31,7 @@
namespace WebCore {
+class Font;
class InlineTextBox;
struct GlyphOverflow;
Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SimpleLineLayoutPagination.h"
+#include "FontCascade.h"
#include "RenderBlockFlow.h"
#include "SimpleLineLayout.h"
#include "SimpleLineLayoutFunctions.h"
Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SimpleLineLayoutTextFragmentIterator.h"
+#include "FontCascade.h"
#include "Hyphenation.h"
#include "RenderBlockFlow.h"
#include "RenderChildIterator.h"
Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -30,6 +30,7 @@
#include "CSSFontSelector.h"
#include "Document.h"
+#include "FontCascade.h"
#include "Logging.h"
#include "RenderListMarker.h"
#include "RenderText.h"
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (217892 => 217893)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -127,6 +127,9 @@
return style;
}
+RenderStyle::RenderStyle(RenderStyle&&) = default;
+RenderStyle& RenderStyle::operator=(RenderStyle&&) = default;
+
RenderStyle::RenderStyle(CreateDefaultStyleTag)
: m_boxData(StyleBoxData::create())
, m_visualData(StyleVisualData::create())
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (217892 => 217893)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-06-07 17:44:45 UTC (rev 217893)
@@ -129,8 +129,8 @@
enum CreateDefaultStyleTag { CreateDefaultStyle };
public:
- RenderStyle(RenderStyle&&) = default;
- RenderStyle& operator=(RenderStyle&&) = default;
+ RenderStyle(RenderStyle&&);
+ RenderStyle& operator=(RenderStyle&&);
~RenderStyle();
RenderStyle replace(RenderStyle&&) WARN_UNUSED_RETURN;
Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (217892 => 217893)
--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -27,6 +27,7 @@
#include "RenderTreeUpdater.h"
#include "AXObjectCache.h"
+#include "CSSAnimationController.h"
#include "ComposedTreeAncestorIterator.h"
#include "ComposedTreeIterator.h"
#include "Document.h"
Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (217892 => 217893)
--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -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"
Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (217892 => 217893)
--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-06-07 17:44:45 UTC (rev 217893)
@@ -26,6 +26,7 @@
#include "config.h"
#include "StyleTreeResolver.h"
+#include "CSSAnimationController.h"
#include "CSSFontSelector.h"
#include "ComposedTreeAncestorIterator.h"
#include "ComposedTreeIterator.h"
Modified: trunk/Source/WebKit/mac/ChangeLog (217892 => 217893)
--- trunk/Source/WebKit/mac/ChangeLog 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-06-07 17:44:45 UTC (rev 217893)
@@ -1,3 +1,12 @@
+2017-06-07 Jer Noble <[email protected]>
+
+ 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 <[email protected]>
[iOS WK1 WebThread] Do not call out to the main thread for device orientation.
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (217892 => 217893)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2017-06-07 17:40:43 UTC (rev 217892)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2017-06-07 17:44:45 UTC (rev 217893)
@@ -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>
