Reduce Font.h includes across project -- improves RenderObject.h compile time
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Aug 2012 22:25:59 +0000 (22:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Aug 2012 22:25:59 +0000 (22:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=93629

Patch by Nikhil Bhargava <nbhargava@google.com> on 2012-08-22
Reviewed by Eric Seidel.

Source/WebCore:

RenderStyle.h no longer depends on Font.h. The files that transitively
need to be updated with proper includes are fixed.

No new tests. Functionality should remain the same.

* accessibility/gtk/WebKitAccessibleInterfaceText.cpp:
* accessibility/mac/WebAccessibilityObjectWrapper.mm:
* bindings/objc/DOM.mm:
* css/CSSComputedStyleDeclaration.cpp:
* css/CSSPrimitiveValue.cpp:
* css/StyleResolver.h:
* dom/CharacterData.cpp:
* dom/ElementRareData.h:
* dom/NodeRenderingContext.cpp:
* dom/Text.cpp:
* editing/TextIterator.cpp:
* editing/mac/EditorMac.mm:
* html/HTMLTitleElement.cpp:
* html/shadow/TextControlInnerElements.cpp:
* inspector/InspectorOverlay.cpp:
* page/ContextMenuController.cpp:
* page/PrintContext.cpp:
* platform/efl/RenderThemeEfl.cpp:
* platform/graphics/FontMetrics.h:
* platform/gtk/RenderThemeGtk.cpp:
* platform/gtk/RenderThemeGtk2.cpp:
* platform/mac/HTMLConverter.mm:
* rendering/EllipsisBox.cpp:
* rendering/FlowThreadController.cpp:
* rendering/InlineBox.cpp:
* rendering/InlineFlowBox.cpp:
* rendering/InlineFlowBox.h:
(WebCore):
* rendering/RenderButton.cpp:
* rendering/RenderCombineText.cpp:
* rendering/RenderCombineText.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
* rendering/RenderEmbeddedObject.h:
(WebCore):
* rendering/RenderFileUploadControl.cpp:
* rendering/RenderFullScreen.h:
* rendering/RenderImage.cpp:
* rendering/RenderInline.cpp:
* rendering/RenderListItem.cpp:
* rendering/RenderListMarker.cpp:
* rendering/RenderMultiColumnBlock.cpp:
* rendering/RenderRegion.h:
* rendering/RenderRuby.cpp:
* rendering/RenderRubyRun.cpp:
* rendering/RenderScrollbar.cpp:
* rendering/RenderTable.cpp:
* rendering/RenderTableCell.cpp:
* rendering/RenderTableRow.cpp:
* rendering/RenderTableSection.cpp:
* rendering/RenderTextControl.cpp:
* rendering/RenderTextControlMultiLine.cpp:
* rendering/RenderThemeChromiumSkia.cpp:
* rendering/RenderView.cpp:
* rendering/TextAutosizer.cpp:
* rendering/mathml/RenderMathMLBlock.h:
* rendering/style/KeyframeList.h:
* rendering/style/RenderStyle.cpp:
* rendering/style/RenderStyle.h:
(WebCore):
* rendering/style/StyleInheritedData.cpp:
* rendering/svg/RenderSVGBlock.cpp:
* rendering/svg/RenderSVGInlineText.h:
* svg/SVGLengthContext.cpp:
* svg/SVGTRefElement.cpp:

Source/WebKit/chromium:

Adds includes due to change in RenderStyle.h

* src/WebFrameImpl.cpp:
* src/mac/WebSubstringUtil.mm:

Source/WebKit/win:

Adds includes due to change in RenderStyle.h

* DOMCoreClasses.cpp:

Source/WebKit2:

Adds includes due to change in RenderStyle.h

* WebProcess/WebPage/mac/WebPageMac.mm:

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

69 files changed:
Source/WebCore/ChangeLog
Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
Source/WebCore/bindings/objc/DOM.mm
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/StyleResolver.h
Source/WebCore/dom/CharacterData.cpp
Source/WebCore/dom/ElementRareData.h
Source/WebCore/dom/NodeRenderingContext.cpp
Source/WebCore/dom/Text.cpp
Source/WebCore/editing/TextIterator.cpp
Source/WebCore/editing/mac/EditorMac.mm
Source/WebCore/html/HTMLTitleElement.cpp
Source/WebCore/html/shadow/TextControlInnerElements.cpp
Source/WebCore/inspector/InspectorOverlay.cpp
Source/WebCore/page/ContextMenuController.cpp
Source/WebCore/page/PrintContext.cpp
Source/WebCore/platform/efl/RenderThemeEfl.cpp
Source/WebCore/platform/graphics/FontMetrics.h
Source/WebCore/platform/gtk/RenderThemeGtk.cpp
Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
Source/WebCore/platform/mac/HTMLConverter.mm
Source/WebCore/rendering/EllipsisBox.cpp
Source/WebCore/rendering/FlowThreadController.cpp
Source/WebCore/rendering/InlineBox.cpp
Source/WebCore/rendering/InlineFlowBox.cpp
Source/WebCore/rendering/InlineFlowBox.h
Source/WebCore/rendering/RenderButton.cpp
Source/WebCore/rendering/RenderCombineText.cpp
Source/WebCore/rendering/RenderCombineText.h
Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
Source/WebCore/rendering/RenderEmbeddedObject.h
Source/WebCore/rendering/RenderFileUploadControl.cpp
Source/WebCore/rendering/RenderFullScreen.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderInline.cpp
Source/WebCore/rendering/RenderListItem.cpp
Source/WebCore/rendering/RenderListMarker.cpp
Source/WebCore/rendering/RenderMultiColumnBlock.cpp
Source/WebCore/rendering/RenderRegion.h
Source/WebCore/rendering/RenderRuby.cpp
Source/WebCore/rendering/RenderRubyRun.cpp
Source/WebCore/rendering/RenderScrollbar.cpp
Source/WebCore/rendering/RenderTable.cpp
Source/WebCore/rendering/RenderTableCell.cpp
Source/WebCore/rendering/RenderTableRow.cpp
Source/WebCore/rendering/RenderTableSection.cpp
Source/WebCore/rendering/RenderTextControl.cpp
Source/WebCore/rendering/RenderTextControlMultiLine.cpp
Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
Source/WebCore/rendering/RenderView.cpp
Source/WebCore/rendering/TextAutosizer.cpp
Source/WebCore/rendering/mathml/RenderMathMLBlock.h
Source/WebCore/rendering/style/KeyframeList.h
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/StyleInheritedData.cpp
Source/WebCore/rendering/svg/RenderSVGBlock.cpp
Source/WebCore/rendering/svg/RenderSVGInlineText.h
Source/WebCore/svg/SVGLengthContext.cpp
Source/WebCore/svg/SVGTRefElement.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/WebFrameImpl.cpp
Source/WebKit/chromium/src/mac/WebSubstringUtil.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/DOMCoreClasses.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

index c8236a9..77fec64 100644 (file)
@@ -1,3 +1,80 @@
+2012-08-22  Nikhil Bhargava  <nbhargava@google.com>
+
+        Reduce Font.h includes across project -- improves RenderObject.h compile time
+        https://bugs.webkit.org/show_bug.cgi?id=93629
+
+        Reviewed by Eric Seidel.
+
+        RenderStyle.h no longer depends on Font.h. The files that transitively
+        need to be updated with proper includes are fixed.
+
+        No new tests. Functionality should remain the same.
+
+        * accessibility/gtk/WebKitAccessibleInterfaceText.cpp:
+        * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+        * bindings/objc/DOM.mm:
+        * css/CSSComputedStyleDeclaration.cpp:
+        * css/CSSPrimitiveValue.cpp:
+        * css/StyleResolver.h:
+        * dom/CharacterData.cpp:
+        * dom/ElementRareData.h:
+        * dom/NodeRenderingContext.cpp:
+        * dom/Text.cpp:
+        * editing/TextIterator.cpp:
+        * editing/mac/EditorMac.mm:
+        * html/HTMLTitleElement.cpp:
+        * html/shadow/TextControlInnerElements.cpp:
+        * inspector/InspectorOverlay.cpp:
+        * page/ContextMenuController.cpp:
+        * page/PrintContext.cpp:
+        * platform/efl/RenderThemeEfl.cpp:
+        * platform/graphics/FontMetrics.h:
+        * platform/gtk/RenderThemeGtk.cpp:
+        * platform/gtk/RenderThemeGtk2.cpp:
+        * platform/mac/HTMLConverter.mm:
+        * rendering/EllipsisBox.cpp:
+        * rendering/FlowThreadController.cpp:
+        * rendering/InlineBox.cpp:
+        * rendering/InlineFlowBox.cpp:
+        * rendering/InlineFlowBox.h:
+        (WebCore):
+        * rendering/RenderButton.cpp:
+        * rendering/RenderCombineText.cpp:
+        * rendering/RenderCombineText.h:
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        * rendering/RenderEmbeddedObject.h:
+        (WebCore):
+        * rendering/RenderFileUploadControl.cpp:
+        * rendering/RenderFullScreen.h:
+        * rendering/RenderImage.cpp:
+        * rendering/RenderInline.cpp:
+        * rendering/RenderListItem.cpp:
+        * rendering/RenderListMarker.cpp:
+        * rendering/RenderMultiColumnBlock.cpp:
+        * rendering/RenderRegion.h:
+        * rendering/RenderRuby.cpp:
+        * rendering/RenderRubyRun.cpp:
+        * rendering/RenderScrollbar.cpp:
+        * rendering/RenderTable.cpp:
+        * rendering/RenderTableCell.cpp:
+        * rendering/RenderTableRow.cpp:
+        * rendering/RenderTableSection.cpp:
+        * rendering/RenderTextControl.cpp:
+        * rendering/RenderTextControlMultiLine.cpp:
+        * rendering/RenderThemeChromiumSkia.cpp:
+        * rendering/RenderView.cpp:
+        * rendering/TextAutosizer.cpp:
+        * rendering/mathml/RenderMathMLBlock.h:
+        * rendering/style/KeyframeList.h:
+        * rendering/style/RenderStyle.cpp:
+        * rendering/style/RenderStyle.h:
+        (WebCore):
+        * rendering/style/StyleInheritedData.cpp:
+        * rendering/svg/RenderSVGBlock.cpp:
+        * rendering/svg/RenderSVGInlineText.h:
+        * svg/SVGLengthContext.cpp:
+        * svg/SVGTRefElement.cpp:
+
 2012-08-22  Alex Christensen  <alex.christensen@flexsim.com>
         win64 compile error fix for BinaryPropertyList.cpp
         https://bugs.webkit.org/show_bug.cgi?id=94122
index c8df364..691d32e 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "AccessibilityObject.h"
 #include "Document.h"
+#include "Font.h"
 #include "FrameView.h"
 #include <wtf/gobject/GOwnPtr.h>
 #include "HostWindow.h"
index 7a9d4bb..c1504e1 100644 (file)
@@ -45,6 +45,7 @@
 #import "Chrome.h"
 #import "ColorMac.h"
 #import "ContextMenuController.h"
+#import "Font.h"
 #import "Frame.h"
 #import "FrameLoaderClient.h"
 #import "FrameSelection.h"
index abc5298..5c77da5 100644 (file)
@@ -34,6 +34,7 @@
 #import "DOMNodeInternal.h"
 #import "DOMPrivate.h"
 #import "DOMRangeInternal.h"
+#import "Font.h"
 #import "Frame.h"
 #import "HTMLElement.h"
 #import "HTMLNames.h"
index 9025367..fe10eb0 100644 (file)
@@ -53,6 +53,7 @@
 #include "RenderStyle.h"
 #include "RenderView.h"
 #include "ShadowValue.h"
+#include "StyleInheritedData.h"
 #include "StylePropertySet.h"
 #include "StylePropertyShorthand.h"
 #include "WebKitCSSTransformValue.h"
index 7d1ca29..c433f20 100644 (file)
@@ -31,6 +31,7 @@
 #include "Color.h"
 #include "Counter.h"
 #include "ExceptionCode.h"
+#include "Font.h"
 #include "MemoryInstrumentation.h"
 #include "Node.h"
 #include "Pair.h"
index 4e9fe91..712085b 100644 (file)
@@ -29,6 +29,7 @@
 #include "MediaQueryExp.h"
 #include "RenderStyle.h"
 #include "SelectorChecker.h"
+#include "StyleInheritedData.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
index b613ab9..8c930d8 100644 (file)
@@ -32,6 +32,7 @@
 #include "MutationRecord.h"
 #include "NodeRenderingContext.h"
 #include "RenderText.h"
+#include "StyleInheritedData.h"
 #include "TextBreakIterator.h"
 #include "UndoManager.h"
 
index 07394eb..b75a0bd 100644 (file)
@@ -29,6 +29,7 @@
 #include "HTMLCollection.h"
 #include "NamedNodeMap.h"
 #include "NodeRareData.h"
+#include "StyleInheritedData.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
index c8e2350..21f1c3f 100644 (file)
@@ -40,6 +40,7 @@
 #include "RenderObject.h"
 #include "RenderView.h"
 #include "ShadowRoot.h"
+#include "StyleInheritedData.h"
 
 #if ENABLE(SVG)
 #include "SVGNames.h"
index 9945f94..87e3663 100644 (file)
@@ -32,6 +32,7 @@
 #include "SVGNames.h"
 #endif
 
+#include "StyleInheritedData.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index 87c10b3..5ca7282 100644 (file)
@@ -28,6 +28,7 @@
 #include "TextIterator.h"
 
 #include "Document.h"
+#include "Font.h"
 #include "Frame.h"
 #include "HTMLElement.h"
 #include "HTMLTextFormControlElement.h"
index 4b8cd44..303a70b 100644 (file)
@@ -34,6 +34,7 @@
 #import "EditingText.h"
 #import "Editor.h"
 #import "EditorClient.h"
+#import "Font.h"
 #import "Frame.h"
 #import "FrameView.h"
 #import "HTMLConverter.h"
index f8a9700..241816f 100644 (file)
@@ -27,6 +27,7 @@
 #include "HTMLNames.h"
 #include "NodeRenderingContext.h"
 #include "RenderStyle.h"
+#include "StyleInheritedData.h"
 #include "Text.h"
 
 namespace WebCore {
index c58f176..116b678 100644 (file)
@@ -42,6 +42,7 @@
 #include "ScriptController.h"
 #include "SpeechInput.h"
 #include "SpeechInputEvent.h"
+#include "StyleInheritedData.h"
 #include "TextEvent.h"
 #include "TextEventInputType.h"
 
index 21bd0ed..981b255 100644 (file)
@@ -33,6 +33,7 @@
 #include "InspectorOverlay.h"
 
 #include "Element.h"
+#include "Font.h"
 #include "FontCache.h"
 #include "FontFamily.h"
 #include "Frame.h"
index 3a8a8dd..d9019fc 100644 (file)
@@ -68,6 +68,7 @@
 #include "UserTypingGestureIndicator.h"
 #include "WindowFeatures.h"
 #include "markup.h"
+#include <wtf/unicode/CharacterNames.h>
 #include <wtf/unicode/Unicode.h>
 
 #if PLATFORM(GTK)
index a2ea78c..a1d138f 100644 (file)
@@ -25,6 +25,7 @@
 #include "Frame.h"
 #include "FrameView.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 92c691a..6de86bd 100644 (file)
@@ -27,6 +27,7 @@
 #include "RenderThemeEfl.h"
 
 #include "CSSValueKeywords.h"
+#include "FontDescription.h"
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
 #include "InputType.h"
index 5fe408b..11b0629 100644 (file)
@@ -20,6 +20,7 @@
 #ifndef FontMetrics_h
 #define FontMetrics_h
 
+#include "FontBaseline.h"
 #include <wtf/MathExtras.h>
 
 namespace WebCore {
index 22b54f6..8c4eab1 100644 (file)
@@ -28,6 +28,7 @@
 #include "CSSValueKeywords.h"
 #include "FileList.h"
 #include "FileSystem.h"
+#include "FontDescription.h"
 #include <wtf/gobject/GOwnPtr.h>
 #include "Gradient.h"
 #include "GraphicsContext.h"
index 7012d3d..1c33e8c 100644 (file)
@@ -32,6 +32,7 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include "CSSValueKeywords.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "GtkVersioning.h"
 #include "HTMLNames.h"
index 67be005..bb6e743 100644 (file)
@@ -36,6 +36,7 @@
 #import "DOMPrivate.h"
 #import "DOMRangeInternal.h"
 #import "Element.h"
+#import "Font.h"
 #import "Frame.h"
 #import "HTMLNames.h"
 #import "HTMLParserIdioms.h"
index 7290cb2..c25673d 100644 (file)
@@ -21,6 +21,7 @@
 #include "EllipsisBox.h"
 
 #include "Document.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
 #include "InlineTextBox.h"
index 71ef91a..476c924 100644 (file)
@@ -34,6 +34,7 @@
 #include "RenderFlowThread.h"
 #include "RenderFlowThreadContainer.h"
 #include "RenderNamedFlowThread.h"
+#include "StyleInheritedData.h"
 #include "WebKitNamedFlow.h"
 #include "WebKitNamedFlowCollection.h"
 #include <wtf/text/AtomicString.h>
index 08bfd69..be3c9c7 100644 (file)
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "InlineBox.h"
 
+#include "FontMetrics.h"
 #include "Frame.h"
 #include "HitTestResult.h"
 #include "InlineFlowBox.h"
index a96f612..c3da100 100644 (file)
@@ -24,6 +24,7 @@
 #include "CSSPropertyNames.h"
 #include "Document.h"
 #include "EllipsisBox.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "InlineTextBox.h"
 #include "HitTestResult.h"
index 20f59d7..32839f1 100644 (file)
@@ -31,8 +31,11 @@ class HitTestRequest;
 class HitTestResult;
 class InlineTextBox;
 class RenderLineBoxList;
+class SimpleFontData;
 class VerticalPositionCache;
 
+struct GlyphOverflow;
+
 typedef HashMap<const InlineTextBox*, pair<Vector<const SimpleFontData*>, GlyphOverflow> > GlyphOverflowAndFallbackFontsMap;
 
 class InlineFlowBox : public InlineBox {
index 5477f9e..7103e6e 100644 (file)
@@ -27,6 +27,7 @@
 #include "HTMLNames.h"
 #include "RenderTextFragment.h"
 #include "RenderTheme.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index c79886a..123661e 100644 (file)
@@ -22,6 +22,7 @@
 #include "RenderCombineText.h"
 
 #include "RenderBlock.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 406c3f6..1433aa0 100644 (file)
@@ -21,6 +21,7 @@
 #ifndef RenderCombineText_h
 #define RenderCombineText_h
 
+#include "Font.h"
 #include "RenderText.h"
 
 namespace WebCore {
index 9c55879..8fa73ae 100644 (file)
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "RenderDeprecatedFlexibleBox.h"
 
+#include "Font.h"
 #include "LayoutRepainter.h"
 #include "RenderLayer.h"
 #include "RenderView.h"
index be854c1..6edc9bf 100644 (file)
@@ -28,6 +28,7 @@
 namespace WebCore {
 
 class MouseEvent;
+class TextRun;
 
 // Renderer for embeds and objects, often, but not always, rendered via plug-ins.
 // For example, <embed src="foo.html"> does not invoke a plug-in.
index bac5b59..de95644 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "ElementShadow.h"
 #include "FileList.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
index a675c5f..a54ac15 100644 (file)
@@ -28,6 +28,7 @@
 #if ENABLE(FULLSCREEN_API)
 
 #include "RenderDeprecatedFlexibleBox.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 48ea054..f399abc 100644 (file)
@@ -29,6 +29,7 @@
 #include "RenderImage.h"
 
 #include "BitmapImage.h"
+#include "Font.h"
 #include "FontCache.h"
 #include "Frame.h"
 #include "FrameSelection.h"
index 35ba973..d58bfc1 100644 (file)
@@ -36,6 +36,7 @@
 #include "RenderLayer.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 #include "TransformState.h"
 #include "VisiblePosition.h"
 
index ef6147f..89d99b3 100644 (file)
@@ -29,6 +29,7 @@
 #include "HTMLOListElement.h"
 #include "RenderListMarker.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringBuilder.h>
 
index 0d2f48d..04d8632 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "CachedImage.h"
 #include "Document.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "RenderLayer.h"
 #include "RenderListItem.h"
index 177a167..9f6bdef 100644 (file)
@@ -27,6 +27,7 @@
 #include "RenderMultiColumnBlock.h"
 #include "RenderMultiColumnFlowThread.h"
 #include "RenderMultiColumnSet.h"
+#include "StyleInheritedData.h"
 
 using namespace std;
 
index 93c0fc0..5f22a75 100644 (file)
@@ -31,6 +31,7 @@
 #define RenderRegion_h
 
 #include "RenderReplaced.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 390db2f..e7b859f 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "RenderRubyRun.h"
 #include "RenderStyle.h"
+#include "StyleInheritedData.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 9c27375..65d764a 100644 (file)
@@ -36,6 +36,7 @@
 #include "RenderRubyText.h"
 #include "RenderText.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 
 using namespace std;
 
index f8e33c6..216c5f8 100644 (file)
@@ -31,6 +31,7 @@
 #include "RenderPart.h"
 #include "RenderScrollbarPart.h"
 #include "RenderScrollbarTheme.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 2cda8dc..77428c4 100644 (file)
@@ -41,6 +41,7 @@
 #include "RenderTableCol.h"
 #include "RenderTableSection.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 
 using namespace std;
 
index 3f304e2..0cefc75 100644 (file)
@@ -33,6 +33,7 @@
 #include "PaintInfo.h"
 #include "RenderTableCol.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 #include "TransformState.h"
 
 using namespace std;
index 7ca33ad..7dc05fa 100644 (file)
@@ -32,6 +32,7 @@
 #include "PaintInfo.h"
 #include "RenderTableCell.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 2644a84..a906a2e 100644 (file)
@@ -34,6 +34,7 @@
 #include "RenderTableCol.h"
 #include "RenderTableRow.h"
 #include "RenderView.h"
+#include "StyleInheritedData.h"
 #include <limits>
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
index 1964d91..3bc25b8 100644 (file)
@@ -27,6 +27,7 @@
 #include "RenderText.h"
 #include "RenderTheme.h"
 #include "ScrollbarTheme.h"
+#include "StyleInheritedData.h"
 #include "TextIterator.h"
 #include "VisiblePosition.h"
 #include <wtf/unicode/CharacterNames.h>
index a46327e..96997d0 100644 (file)
@@ -27,6 +27,7 @@
 #include "HTMLTextAreaElement.h"
 #include "HitTestResult.h"
 #include "ShadowRoot.h"
+#include "StyleInheritedData.h"
 #include "TextControlInnerElements.h"
 
 namespace WebCore {
index 3eaae41..0a58af6 100644 (file)
@@ -25,6 +25,7 @@
 #include "RenderThemeChromiumSkia.h"
 
 #include "CSSValueKeywords.h"
+#include "Font.h"
 #include "GraphicsContext.h"
 #include "HTMLMediaElement.h"
 #include "HTMLNames.h"
index ec2d1b8..02b54c6 100644 (file)
@@ -38,6 +38,7 @@
 #include "RenderSelectionInfo.h"
 #include "RenderWidget.h"
 #include "RenderWidgetProtector.h"
+#include "StyleInheritedData.h"
 #include "TransformState.h"
 
 #if USE(ACCELERATED_COMPOSITING)
index 9e0f2a4..6122962 100644 (file)
@@ -31,6 +31,7 @@
 #include "RenderText.h"
 #include "RenderView.h"
 #include "Settings.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index 25ec750..cd1e26c 100644 (file)
@@ -30,6 +30,7 @@
 #if ENABLE(MATHML)
 
 #include "RenderBlock.h"
+#include "StyleInheritedData.h"
 
 #define ENABLE_DEBUG_MATH_LAYOUT 0
 
index 5101b06..6193fa6 100644 (file)
@@ -26,6 +26,7 @@
 #define KeyframeList_h
 
 #include "CSSPropertyNames.h"
+#include "StyleInheritedData.h"
 #include <wtf/Vector.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
index 72a4389..37d9890 100644 (file)
@@ -26,6 +26,7 @@
 #include "ContentData.h"
 #include "CursorList.h"
 #include "CSSPropertyNames.h"
+#include "Font.h"
 #include "FontSelector.h"
 #include "MemoryInstrumentation.h"
 #include "QuotesData.h"
@@ -34,6 +35,7 @@
 #include "ScaleTransformOperation.h"
 #include "ShadowData.h"
 #include "StyleImage.h"
+#include "StyleInheritedData.h"
 #include "StyleResolver.h"
 #if ENABLE(TOUCH_EVENTS)
 #include "RenderTheme.h"
index 0925f80..011950c 100644 (file)
@@ -35,7 +35,8 @@
 #include "CounterDirectives.h"
 #include "DataRef.h"
 #include "FillLayer.h"
-#include "Font.h"
+#include "FontBaseline.h"
+#include "FontDescription.h"
 #include "GraphicsTypes.h"
 #include "Length.h"
 #include "LengthBox.h"
@@ -53,7 +54,6 @@
 #include "StyleFlexibleBoxData.h"
 #include "StyleGridData.h"
 #include "StyleGridItemData.h"
-#include "StyleInheritedData.h"
 #include "StyleMarqueeData.h"
 #include "StyleMultiColData.h"
 #include "StyleRareInheritedData.h"
@@ -104,11 +104,14 @@ using std::max;
 class BorderData;
 class CounterContent;
 class CursorList;
+class Font;
+class FontMetrics;
 class IntRect;
 class MemoryObjectInfo;
 class Pair;
 class ShadowData;
 class StyleImage;
+class StyleInheritedData;
 class StyleResolver;
 class TransformationMatrix;
 
index ad14cbb..021740f 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "StyleRareInheritedData.h"
+#include "StyleInheritedData.h"
 
 #include "RenderStyle.h"
 #include "StyleImage.h"
index c4f9a28..3612794 100644 (file)
@@ -27,6 +27,7 @@
 #include "RenderSVGResource.h"
 #include "SVGElement.h"
 #include "SVGResourcesCache.h"
+#include "StyleInheritedData.h"
 
 namespace WebCore {
 
index ab81ca9..7643cf1 100644 (file)
@@ -23,6 +23,7 @@
 #define RenderSVGInlineText_h
 
 #if ENABLE(SVG)
+#include "Font.h"
 #include "RenderText.h"
 #include "SVGTextLayoutAttributes.h"
 
index d33de34..51b4900 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "CSSHelper.h"
 #include "ExceptionCode.h"
+#include "FontMetrics.h"
 #include "Frame.h"
 #include "RenderPart.h"
 #include "RenderSVGRoot.h"
index cc3b554..f74e011 100644 (file)
@@ -36,6 +36,7 @@
 #include "SVGDocument.h"
 #include "SVGElementInstance.h"
 #include "SVGNames.h"
+#include "StyleInheritedData.h"
 #include "Text.h"
 #include "XLinkNames.h"
 
index c651a35..37e6cd9 100644 (file)
@@ -1,5 +1,17 @@
 2012-08-22  Nikhil Bhargava  <nbhargava@google.com>
 
+        Reduce Font.h includes across project -- improves RenderObject.h compile time
+        https://bugs.webkit.org/show_bug.cgi?id=93629
+
+        Reviewed by Eric Seidel.
+
+        Adds includes due to change in RenderStyle.h
+
+        * src/WebFrameImpl.cpp:
+        * src/mac/WebSubstringUtil.mm:
+
+2012-08-22  Nikhil Bhargava  <nbhargava@google.com>
+
         Speed up compilation of tests involving WebTransformationMatrix
         https://bugs.webkit.org/show_bug.cgi?id=94639
 
index c7b3e1b..4279feb 100644 (file)
 #include "ShadowRoot.h"
 #include "SkiaUtils.h"
 #include "SpellChecker.h"
+#include "StyleInheritedData.h"
 #include "SubstituteData.h"
 #include "TextAffinity.h"
 #include "TextIterator.h"
index 7fd19f5..dd9951f 100644 (file)
@@ -36,6 +36,7 @@
 #include "ColorMac.h"
 #include "Document.h"
 #include "Element.h"
+#include "Font.h"
 #include "Frame.h"
 #include "FrameView.h"
 #include "HTMLElement.h"
index ed76faf..96ce099 100644 (file)
@@ -1,3 +1,14 @@
+2012-08-22  Nikhil Bhargava  <nbhargava@google.com>
+
+        Reduce Font.h includes across project -- improves RenderObject.h compile time
+        https://bugs.webkit.org/show_bug.cgi?id=93629
+
+        Reviewed by Eric Seidel.
+
+        Adds includes due to change in RenderStyle.h
+
+        * DOMCoreClasses.cpp:
+
 2012-08-15  Ryosuke Niwa  <rniwa@webkit.org>
 
         Update manual tests and comments to refer to TestRunner instead of LayoutTestController
index 26d6ea5..42fb2e0 100644 (file)
@@ -37,6 +37,7 @@
 #include <WebCore/DOMWindow.h>
 #include <WebCore/Document.h>
 #include <WebCore/Element.h>
+#include <WebCore/Font.h>
 #include <WebCore/Frame.h>
 #include <WebCore/SimpleFontData.h>
 #include <WebCore/HTMLFormElement.h>
index b9c06dc..606ce66 100644 (file)
@@ -1,3 +1,14 @@
+2012-08-22  Nikhil Bhargava  <nbhargava@google.com>
+
+        Reduce Font.h includes across project -- improves RenderObject.h compile time
+        https://bugs.webkit.org/show_bug.cgi?id=93629
+
+        Reviewed by Eric Seidel.
+
+        Adds includes due to change in RenderStyle.h
+
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+
 2012-08-22  Beth Dakin  <bdakin@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=94401
index 43d381e..c2f0165 100644 (file)
@@ -55,6 +55,7 @@
 #import <WebCore/RenderObject.h>
 #import <WebCore/RenderStyle.h>
 #import <WebCore/ScrollView.h>
+#import <WebCore/StyleInheritedData.h>
 #import <WebCore/TextIterator.h>
 #import <WebCore/WindowsKeyboardCodes.h>
 #import <WebCore/visible_units.h>