Attachment 157845 Details for Bug 93629 – Patch

[patch] Patch

bug-93629-20120810175043.patch (text/plain), 49.59 KB, created by nbhargava on 2012-08-10 17:51:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: nbhargava

Created: 2012-08-10 17:51:12 PDT

Size: 49.59 KB

patch

obsolete

>Subversion Revision: 125299
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6f00988b5897c93f9b4807fb1e695f0351ee026b..9d3dc8da655985ed29f95eafecba941276ea4fe3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,102 @@
>+2012-08-10  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 NOBODY (OOPS!).
>+
>+        RenderStyle.cpp and RenderStyle.h are modified to remove dependencies on
>+        Font.h. The remaining files are cleaned up if they do need Font.h. The
>+        biggest impact is that RenderObject.h no longer always includes Font
>+
>+        No new tests. Functionality should remain the same.
>+
>+        * 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/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:
>+        (WebCore::RenderStyle::listStyleImage):
>+        (WebCore::RenderStyle::setListStyleImage):
>+        (WebCore):
>+        (WebCore::RenderStyle::color):
>+        (WebCore::RenderStyle::visitedLinkColor):
>+        (WebCore::RenderStyle::setColor):
>+        (WebCore::RenderStyle::setVisitedLinkColor):
>+        (WebCore::RenderStyle::horizontalBorderSpacing):
>+        (WebCore::RenderStyle::verticalBorderSpacing):
>+        (WebCore::RenderStyle::setHorizontalBorderSpacing):
>+        (WebCore::RenderStyle::setVerticalBorderSpacing):
>+        (WebCore::RenderStyle::font):
>+        (WebCore::RenderStyle::fontMetrics):
>+        (WebCore::RenderStyle::fontDescription):
>+        (WebCore::RenderStyle::fontSize):
>+        (WebCore::RenderStyle::wordSpacing):
>+        (WebCore::RenderStyle::letterSpacing):
>+        (WebCore::RenderStyle::setFontDescription):
>+        (WebCore::RenderStyle::lineHeight):
>+        (WebCore::RenderStyle::setLineHeight):
>+        (WebCore::RenderStyle::computedLineHeight):
>+        (WebCore::RenderStyle::setWordSpacing):
>+        (WebCore::RenderStyle::setLetterSpacing):
>+        * 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-10  Dan Bernstein  <mitz@apple.com>
> 
>         Renamed the âModules/webaudioâ group in the Xcode project to âwebaudioâ and moved it into
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 9a17f27559fda638932fea3b5cbe0400b31ff678..d8e114a07d27df7ee9d5cbcd6c55c05e65b8f208 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-08-10  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 NOBODY (OOPS!).
>+
>+        Update includes due to changes in RenderStyle.h/.cpp
>+
>+        * src/WebFrameImpl.cpp:
>+        * src/mac/WebSubstringUtil.mm:
>+
> 2012-08-10  Dana Jansens  <danakj@chromium.org>
> 
>         [chromium] Remove scissor from the namings in CCOcclusionTracker
>diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
>index d13a3fc1cd2a6b81f58f8c7c3ed9a0c49b045eaf..061048595bda10781493bbdb648b5fd97b176199 100644
>--- a/Source/WebKit/win/ChangeLog
>+++ b/Source/WebKit/win/ChangeLog
>@@ -1,3 +1,14 @@
>+2012-08-10  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 NOBODY (OOPS!).
>+
>+        Update includes due to changes in RenderStyle.h/.cpp
>+
>+        * DOMCoreClasses.cpp:
>+
> 2012-08-05  Patrick Gansterer  <paroga@webkit.org>
> 
>         [WIN] Use sizeof() for cbWndExtra values
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 4e2b08a4d112064aeba144ba041381d4233b34d9..32d5bd00a545a42864cbec2a0ab2d6af78090eb7 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,14 @@
>+2012-08-10  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 NOBODY (OOPS!).
>+
>+        Update includes due to changes in RenderStyle.h/.cpp
>+
>+        * WebProcess/WebPage/mac/WebPageMac.mm:
>+
> 2012-08-10  Rafael Brandao  <rafael.lobo@openbossa.org>
> 
>         [Qt] WebViewLoadFavIcon::test_favIconLoad() fails
>diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
>index 7a9d4bb7c1849caafba86cf798b68d5b4a6bdc5a..c1504e1039dd12c48cd060a6b1c4239ec2dc0ee7 100644
>--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
>+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm
>@@ -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"
>diff --git a/Source/WebCore/bindings/objc/DOM.mm b/Source/WebCore/bindings/objc/DOM.mm
>index abc529892043fdcb8bf01d55cad24e460b884aa0..5c77da5c2e558fbec7c6acf76e802f8552ef23ad 100644
>--- a/Source/WebCore/bindings/objc/DOM.mm
>+++ b/Source/WebCore/bindings/objc/DOM.mm
>@@ -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"
>diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>index 7a050682dfbbb97e53e34cba11566bc93fbd00ee..568a41a0cf5a658fbeb0742e933d76e5d332613b 100644
>--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>@@ -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"
>diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp
>index e40ddcd262cf6bcd0ff0c79449b41bd3de0c93a7..97715e11fdca4b670d5a0354bd584226dabba240 100644
>--- a/Source/WebCore/css/CSSPrimitiveValue.cpp
>+++ b/Source/WebCore/css/CSSPrimitiveValue.cpp
>@@ -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"
>diff --git a/Source/WebCore/css/StyleResolver.h b/Source/WebCore/css/StyleResolver.h
>index 46f909ad27edb10cd2f46f99d3b67472b3e54a19..4aef22420f4e7cc52b65168c75994f5ab7ade534 100644
>--- a/Source/WebCore/css/StyleResolver.h
>+++ b/Source/WebCore/css/StyleResolver.h
>@@ -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>
>diff --git a/Source/WebCore/dom/CharacterData.cpp b/Source/WebCore/dom/CharacterData.cpp
>index 91f5ac70f8c691b8f3efb76391c642b40be06d0d..4279cfaa60b801e971cf09111c6cacd32c70689e 100644
>--- a/Source/WebCore/dom/CharacterData.cpp
>+++ b/Source/WebCore/dom/CharacterData.cpp
>@@ -32,6 +32,7 @@
> #include "MutationRecord.h"
> #include "NodeRenderingContext.h"
> #include "RenderText.h"
>+#include "StyleInheritedData.h"
> #include "TextBreakIterator.h"
> 
> using namespace std;
>diff --git a/Source/WebCore/dom/ElementRareData.h b/Source/WebCore/dom/ElementRareData.h
>index 666cc46070450448cbee0e42541548be91916e4d..899c145488579dfeb541225e6e44817a30b9bcac 100644
>--- a/Source/WebCore/dom/ElementRareData.h
>+++ b/Source/WebCore/dom/ElementRareData.h
>@@ -29,6 +29,7 @@
> #include "HTMLCollection.h"
> #include "NamedNodeMap.h"
> #include "NodeRareData.h"
>+#include "StyleInheritedData.h"
> #include "UndoManager.h"
> #include <wtf/OwnPtr.h>
> 
>diff --git a/Source/WebCore/dom/NodeRenderingContext.cpp b/Source/WebCore/dom/NodeRenderingContext.cpp
>index 84bdf90eb695e9f16d5e24d1bfedb2263c593dfd..8658b6faffd9c180e4b848ce308a3067c2a8fa61 100644
>--- a/Source/WebCore/dom/NodeRenderingContext.cpp
>+++ b/Source/WebCore/dom/NodeRenderingContext.cpp
>@@ -40,6 +40,7 @@
> #include "RenderObject.h"
> #include "RenderView.h"
> #include "ShadowRoot.h"
>+#include "StyleInheritedData.h"
> 
> #if ENABLE(SVG)
> #include "SVGNames.h"
>diff --git a/Source/WebCore/dom/Text.cpp b/Source/WebCore/dom/Text.cpp
>index a00aaeb539ea6c5719c12898537eb6e6cda89733..cab54ee270adb6970b4cfb6027bbce15df6852c4 100644
>--- a/Source/WebCore/dom/Text.cpp
>+++ b/Source/WebCore/dom/Text.cpp
>@@ -32,6 +32,7 @@
> #include "SVGNames.h"
> #endif
> 
>+#include "StyleInheritedData.h"
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
> 
>diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp
>index 7ca3dbeeab74c6535605139583f6d9c670df9f36..f67c17a59868a2a202aa4151e98bf78c2b55b34c 100644
>--- a/Source/WebCore/editing/TextIterator.cpp
>+++ b/Source/WebCore/editing/TextIterator.cpp
>@@ -28,6 +28,7 @@
> #include "TextIterator.h"
> 
> #include "Document.h"
>+#include "Font.h"
> #include "Frame.h"
> #include "HTMLElement.h"
> #include "HTMLTextFormControlElement.h"
>diff --git a/Source/WebCore/editing/mac/EditorMac.mm b/Source/WebCore/editing/mac/EditorMac.mm
>index 4b8cd442b272c26816756c795085cc7e29a34c5f..303a70b726bd07a427f7011021dca6149e981238 100644
>--- a/Source/WebCore/editing/mac/EditorMac.mm
>+++ b/Source/WebCore/editing/mac/EditorMac.mm
>@@ -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"
>diff --git a/Source/WebCore/html/HTMLTitleElement.cpp b/Source/WebCore/html/HTMLTitleElement.cpp
>index f8a97001dca0509bb909c31ece6f41776723ac7e..241816ff309c44aa64d27e8c0f729854e22aec56 100644
>--- a/Source/WebCore/html/HTMLTitleElement.cpp
>+++ b/Source/WebCore/html/HTMLTitleElement.cpp
>@@ -27,6 +27,7 @@
> #include "HTMLNames.h"
> #include "NodeRenderingContext.h"
> #include "RenderStyle.h"
>+#include "StyleInheritedData.h"
> #include "Text.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/html/shadow/TextControlInnerElements.cpp b/Source/WebCore/html/shadow/TextControlInnerElements.cpp
>index e06d56f2f17ab8307cd50b5d6b6bba7e78da0f93..71b155609e1dde97f5881aea7c7bd4045709953f 100644
>--- a/Source/WebCore/html/shadow/TextControlInnerElements.cpp
>+++ b/Source/WebCore/html/shadow/TextControlInnerElements.cpp
>@@ -43,6 +43,7 @@
> #include "ScrollbarTheme.h"
> #include "SpeechInput.h"
> #include "SpeechInputEvent.h"
>+#include "StyleInheritedData.h"
> #include "TextEvent.h"
> #include "TextEventInputType.h"
> 
>diff --git a/Source/WebCore/inspector/InspectorOverlay.cpp b/Source/WebCore/inspector/InspectorOverlay.cpp
>index 21bd0ed497d574fda955e9fe8374ddebfe6f533a..981b2552bc473483ae5b7a8afa1ba73e63440805 100644
>--- a/Source/WebCore/inspector/InspectorOverlay.cpp
>+++ b/Source/WebCore/inspector/InspectorOverlay.cpp
>@@ -33,6 +33,7 @@
> #include "InspectorOverlay.h"
> 
> #include "Element.h"
>+#include "Font.h"
> #include "FontCache.h"
> #include "FontFamily.h"
> #include "Frame.h"
>diff --git a/Source/WebCore/page/ContextMenuController.cpp b/Source/WebCore/page/ContextMenuController.cpp
>index 3a8a8dd8a10d7b44655de2f9a3e6d73599e68f14..d9019fc30fd5d8646f2f4eff4ea54f489f89385b 100644
>--- a/Source/WebCore/page/ContextMenuController.cpp
>+++ b/Source/WebCore/page/ContextMenuController.cpp
>@@ -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)
>diff --git a/Source/WebCore/page/PrintContext.cpp b/Source/WebCore/page/PrintContext.cpp
>index a2ea78c7648e06b6f0bed232902d581b93aae06c..a1d138f3ede9ec6321202c9f624ba440596b3fd5 100644
>--- a/Source/WebCore/page/PrintContext.cpp
>+++ b/Source/WebCore/page/PrintContext.cpp
>@@ -25,6 +25,7 @@
> #include "Frame.h"
> #include "FrameView.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> #include <wtf/text/WTFString.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/efl/RenderThemeEfl.cpp b/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>index 8edc2aafad543b16ec8258215d0bac0641d0085a..4a4303cdf007aa905e41620d8b156fc1b925a6d9 100644
>--- a/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>+++ b/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>@@ -27,6 +27,7 @@
> #include "RenderThemeEfl.h"
> 
> #include "CSSValueKeywords.h"
>+#include "FontDescription.h"
> #include "GraphicsContext.h"
> #include "HTMLInputElement.h"
> #include "InputType.h"
>diff --git a/Source/WebCore/platform/graphics/FontMetrics.h b/Source/WebCore/platform/graphics/FontMetrics.h
>index 5fe408bb67114d361a8735425ba7db1cc60e9578..11b06291821e1515de01fde4c78565e4e5fd4b60 100644
>--- a/Source/WebCore/platform/graphics/FontMetrics.h
>+++ b/Source/WebCore/platform/graphics/FontMetrics.h
>@@ -20,6 +20,7 @@
> #ifndef FontMetrics_h
> #define FontMetrics_h
> 
>+#include "FontBaseline.h"
> #include <wtf/MathExtras.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>index 22b54f65148d5e3d1d37641c6e3ee2074bf92ca3..8c4eab13ba31b659135b927accaf17c8ef4e93a6 100644
>--- a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>+++ b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>@@ -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"
>diff --git a/Source/WebCore/platform/mac/HTMLConverter.mm b/Source/WebCore/platform/mac/HTMLConverter.mm
>index 67be0059c0ae7695e0ec84b8c86ff792c7edbc7d..bb6e743b69192d083f9f80e64f6cb7398cf39c31 100644
>--- a/Source/WebCore/platform/mac/HTMLConverter.mm
>+++ b/Source/WebCore/platform/mac/HTMLConverter.mm
>@@ -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"
>diff --git a/Source/WebCore/rendering/EllipsisBox.cpp b/Source/WebCore/rendering/EllipsisBox.cpp
>index 8c00fca75cb2cef967e12d532c77d5aef7d64a99..040edb1c5baced9608216c5698c42a04bf441466 100644
>--- a/Source/WebCore/rendering/EllipsisBox.cpp
>+++ b/Source/WebCore/rendering/EllipsisBox.cpp
>@@ -21,6 +21,7 @@
> #include "EllipsisBox.h"
> 
> #include "Document.h"
>+#include "Font.h"
> #include "GraphicsContext.h"
> #include "HitTestResult.h"
> #include "InlineTextBox.h"
>diff --git a/Source/WebCore/rendering/FlowThreadController.cpp b/Source/WebCore/rendering/FlowThreadController.cpp
>index dc9432c76506ca0f4581abd71a01cd88d646076a..a81ed3d482836831310aadebdaac92ac31c7d4f3 100644
>--- a/Source/WebCore/rendering/FlowThreadController.cpp
>+++ b/Source/WebCore/rendering/FlowThreadController.cpp
>@@ -33,6 +33,7 @@
> 
> #include "RenderFlowThread.h"
> #include "RenderNamedFlowThread.h"
>+#include "StyleInheritedData.h"
> #include "WebKitNamedFlow.h"
> #include "WebKitNamedFlowCollection.h"
> #include <wtf/text/AtomicString.h>
>diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp
>index 08bfd697032a6c5f7c8ea9eea45b937737b35ee6..be3c9c7cf446447b01a826ad6231fc20df67de21 100644
>--- a/Source/WebCore/rendering/InlineBox.cpp
>+++ b/Source/WebCore/rendering/InlineBox.cpp
>@@ -20,6 +20,7 @@
> #include "config.h"
> #include "InlineBox.h"
> 
>+#include "FontMetrics.h"
> #include "Frame.h"
> #include "HitTestResult.h"
> #include "InlineFlowBox.h"
>diff --git a/Source/WebCore/rendering/InlineFlowBox.cpp b/Source/WebCore/rendering/InlineFlowBox.cpp
>index a96f61225843a970f2ff6bb7944bd9cef916a9b6..c3da100250d2a21e47faa54f5d4926c9dc816061 100644
>--- a/Source/WebCore/rendering/InlineFlowBox.cpp
>+++ b/Source/WebCore/rendering/InlineFlowBox.cpp
>@@ -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"
>diff --git a/Source/WebCore/rendering/InlineFlowBox.h b/Source/WebCore/rendering/InlineFlowBox.h
>index 20f59d723cc08434fbe043bc1c4828d65e076f4d..32839f15f8742f78113969f372d2f092b6777440 100644
>--- a/Source/WebCore/rendering/InlineFlowBox.h
>+++ b/Source/WebCore/rendering/InlineFlowBox.h
>@@ -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 {
>diff --git a/Source/WebCore/rendering/RenderButton.cpp b/Source/WebCore/rendering/RenderButton.cpp
>index 5477f9e50805956927df93e616dce04bfcc294fb..7103e6e5048349cb88d66227871f2757129364ee 100644
>--- a/Source/WebCore/rendering/RenderButton.cpp
>+++ b/Source/WebCore/rendering/RenderButton.cpp
>@@ -27,6 +27,7 @@
> #include "HTMLNames.h"
> #include "RenderTextFragment.h"
> #include "RenderTheme.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderCombineText.cpp b/Source/WebCore/rendering/RenderCombineText.cpp
>index c79886a9d7533d32384cd6a88b3b9ce7460f035a..123661e4dfd78ecdcc6f86db6df61cc75890febb 100644
>--- a/Source/WebCore/rendering/RenderCombineText.cpp
>+++ b/Source/WebCore/rendering/RenderCombineText.cpp
>@@ -22,6 +22,7 @@
> #include "RenderCombineText.h"
> 
> #include "RenderBlock.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderCombineText.h b/Source/WebCore/rendering/RenderCombineText.h
>index 406c3f6a3b79586426fb17842c58cbb19e172d64..1433aa005ad6f2e45d2c68576e1265ed364d762e 100644
>--- a/Source/WebCore/rendering/RenderCombineText.h
>+++ b/Source/WebCore/rendering/RenderCombineText.h
>@@ -21,6 +21,7 @@
> #ifndef RenderCombineText_h
> #define RenderCombineText_h
> 
>+#include "Font.h"
> #include "RenderText.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
>index 830efb2b0830975bbe02355b1748134fd1b33d46..01b19acad614fb4c6d902b30d04ad8ed6e4c3df4 100644
>--- a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
>+++ b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
>@@ -25,6 +25,7 @@
> #include "config.h"
> #include "RenderDeprecatedFlexibleBox.h"
> 
>+#include "Font.h"
> #include "LayoutRepainter.h"
> #include "RenderLayer.h"
> #include "RenderView.h"
>diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.h b/Source/WebCore/rendering/RenderEmbeddedObject.h
>index be854c1ed03efcef46473b5e208ce0ab8a17277e..6edc9bfb7c4eb3e88fa0c84047ebe4d953b92c6a 100644
>--- a/Source/WebCore/rendering/RenderEmbeddedObject.h
>+++ b/Source/WebCore/rendering/RenderEmbeddedObject.h
>@@ -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.
>diff --git a/Source/WebCore/rendering/RenderFileUploadControl.cpp b/Source/WebCore/rendering/RenderFileUploadControl.cpp
>index bac5b59c7563cfec4ae9747557c58c99018e1074..de956445660432604810bb7436e136b7efa596e6 100644
>--- a/Source/WebCore/rendering/RenderFileUploadControl.cpp
>+++ b/Source/WebCore/rendering/RenderFileUploadControl.cpp
>@@ -23,6 +23,7 @@
> 
> #include "ElementShadow.h"
> #include "FileList.h"
>+#include "Font.h"
> #include "GraphicsContext.h"
> #include "HTMLInputElement.h"
> #include "HTMLNames.h"
>diff --git a/Source/WebCore/rendering/RenderFullScreen.h b/Source/WebCore/rendering/RenderFullScreen.h
>index a675c5f09cb7120578c0fed6ffeeeb834d0f3572..a54ac1561b0398db7077dd0adf2def124cbbf16d 100644
>--- a/Source/WebCore/rendering/RenderFullScreen.h
>+++ b/Source/WebCore/rendering/RenderFullScreen.h
>@@ -28,6 +28,7 @@
> #if ENABLE(FULLSCREEN_API)
> 
> #include "RenderDeprecatedFlexibleBox.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
>index 48ea05470ddf04bd1042d5eb30c16bfce78d3b14..f399abc4d30f55db2035374789c53377512c03a4 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -29,6 +29,7 @@
> #include "RenderImage.h"
> 
> #include "BitmapImage.h"
>+#include "Font.h"
> #include "FontCache.h"
> #include "Frame.h"
> #include "FrameSelection.h"
>diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp
>index da120bed1714a0860d32ce73cc575d7c70424294..ae0d12645ba5fff52676cd937bc59a873de2a57e 100644
>--- a/Source/WebCore/rendering/RenderInline.cpp
>+++ b/Source/WebCore/rendering/RenderInline.cpp
>@@ -36,6 +36,7 @@
> #include "RenderLayer.h"
> #include "RenderTheme.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> #include "TransformState.h"
> #include "VisiblePosition.h"
> 
>diff --git a/Source/WebCore/rendering/RenderListItem.cpp b/Source/WebCore/rendering/RenderListItem.cpp
>index 2f7ff6e324e9eb04e0d41fa9de0e3a5747dc1a44..5fb6574d9879be0bc8fbbef699e47eb9befed5ff 100644
>--- a/Source/WebCore/rendering/RenderListItem.cpp
>+++ b/Source/WebCore/rendering/RenderListItem.cpp
>@@ -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>
> 
>diff --git a/Source/WebCore/rendering/RenderListMarker.cpp b/Source/WebCore/rendering/RenderListMarker.cpp
>index 0d2f48dd5101e7f4c7c34efa0623a8b0b8904874..04d8632a819f89ee19496094cb21f17f4a674b4c 100644
>--- a/Source/WebCore/rendering/RenderListMarker.cpp
>+++ b/Source/WebCore/rendering/RenderListMarker.cpp
>@@ -27,6 +27,7 @@
> 
> #include "CachedImage.h"
> #include "Document.h"
>+#include "Font.h"
> #include "GraphicsContext.h"
> #include "RenderLayer.h"
> #include "RenderListItem.h"
>diff --git a/Source/WebCore/rendering/RenderMultiColumnBlock.cpp b/Source/WebCore/rendering/RenderMultiColumnBlock.cpp
>index 958cc7687d05aa71d20cd825173455c776cfa7fe..dc04923de372baca1646aa7c0dd03617e21ed0a4 100644
>--- a/Source/WebCore/rendering/RenderMultiColumnBlock.cpp
>+++ b/Source/WebCore/rendering/RenderMultiColumnBlock.cpp
>@@ -27,6 +27,7 @@
> #include "RenderMultiColumnBlock.h"
> #include "RenderMultiColumnFlowThread.h"
> #include "RenderMultiColumnSet.h"
>+#include "StyleInheritedData.h"
> 
> using namespace std;
> 
>diff --git a/Source/WebCore/rendering/RenderRegion.h b/Source/WebCore/rendering/RenderRegion.h
>index 6093a9c030f3eecc1dce42f480b17d6e32960b25..2dd39f47583eac133dc358c36dceaabb538c9494 100644
>--- a/Source/WebCore/rendering/RenderRegion.h
>+++ b/Source/WebCore/rendering/RenderRegion.h
>@@ -31,6 +31,7 @@
> #define RenderRegion_h
> 
> #include "RenderReplaced.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderRuby.cpp b/Source/WebCore/rendering/RenderRuby.cpp
>index 390db2f5636b85a680d98bfddc2f7f099a36f6c9..e7b859f70de283ce35434d5e103717dd665c514a 100644
>--- a/Source/WebCore/rendering/RenderRuby.cpp
>+++ b/Source/WebCore/rendering/RenderRuby.cpp
>@@ -34,6 +34,7 @@
> 
> #include "RenderRubyRun.h"
> #include "RenderStyle.h"
>+#include "StyleInheritedData.h"
> #include <wtf/RefPtr.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/rendering/RenderRubyRun.cpp b/Source/WebCore/rendering/RenderRubyRun.cpp
>index 9c27375df149909a4c32ea3e59845d0e480774a2..65d764a9b65a9f1779fe75435de6791ad66ece69 100644
>--- a/Source/WebCore/rendering/RenderRubyRun.cpp
>+++ b/Source/WebCore/rendering/RenderRubyRun.cpp
>@@ -36,6 +36,7 @@
> #include "RenderRubyText.h"
> #include "RenderText.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> 
> using namespace std;
> 
>diff --git a/Source/WebCore/rendering/RenderScrollbar.cpp b/Source/WebCore/rendering/RenderScrollbar.cpp
>index f8e33c6508a2b4cfe0abf768ce949e29596a2b62..216c5f8d89699b35d77360fc7d09da3459522f44 100644
>--- a/Source/WebCore/rendering/RenderScrollbar.cpp
>+++ b/Source/WebCore/rendering/RenderScrollbar.cpp
>@@ -31,6 +31,7 @@
> #include "RenderPart.h"
> #include "RenderScrollbarPart.h"
> #include "RenderScrollbarTheme.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderTable.cpp b/Source/WebCore/rendering/RenderTable.cpp
>index 2cda8dcc733b45f5c07847e557655d6d3c93e18f..77428c499d1f5fd39ef39cdb9d7db9878f39be46 100644
>--- a/Source/WebCore/rendering/RenderTable.cpp
>+++ b/Source/WebCore/rendering/RenderTable.cpp
>@@ -41,6 +41,7 @@
> #include "RenderTableCol.h"
> #include "RenderTableSection.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> 
> using namespace std;
> 
>diff --git a/Source/WebCore/rendering/RenderTableCell.cpp b/Source/WebCore/rendering/RenderTableCell.cpp
>index 3f304e284a14374f07368b83a517d7f769449ec1..0cefc75a8280475659e51afe0d3b3afc67610f3d 100644
>--- a/Source/WebCore/rendering/RenderTableCell.cpp
>+++ b/Source/WebCore/rendering/RenderTableCell.cpp
>@@ -33,6 +33,7 @@
> #include "PaintInfo.h"
> #include "RenderTableCol.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> #include "TransformState.h"
> 
> using namespace std;
>diff --git a/Source/WebCore/rendering/RenderTableRow.cpp b/Source/WebCore/rendering/RenderTableRow.cpp
>index 7ca33ad61259431088e931c384e2bbb606a4a6b1..7dc05fa567db77effbb057d005b09154d46a7e33 100644
>--- a/Source/WebCore/rendering/RenderTableRow.cpp
>+++ b/Source/WebCore/rendering/RenderTableRow.cpp
>@@ -32,6 +32,7 @@
> #include "PaintInfo.h"
> #include "RenderTableCell.h"
> #include "RenderView.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderTableSection.cpp b/Source/WebCore/rendering/RenderTableSection.cpp
>index 1f1379e48d65532c44ff624d269d1422c49a3bd7..ad2de21cae2f887767b943444a8a0d1b05d566d0 100644
>--- a/Source/WebCore/rendering/RenderTableSection.cpp
>+++ b/Source/WebCore/rendering/RenderTableSection.cpp
>@@ -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>
>diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
>index 10a420aa8f63e269a8fedbc6b1203c3190db1ba9..bb41423525ddb794d4e524074109330dade80720 100644
>--- a/Source/WebCore/rendering/RenderTextControl.cpp
>+++ b/Source/WebCore/rendering/RenderTextControl.cpp
>@@ -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>
>diff --git a/Source/WebCore/rendering/RenderTextControlMultiLine.cpp b/Source/WebCore/rendering/RenderTextControlMultiLine.cpp
>index a46327e65ea922489adf7a29c0b52f31548aaa64..96997d0edd10d6f58034bb70774c5bcb8563b937 100644
>--- a/Source/WebCore/rendering/RenderTextControlMultiLine.cpp
>+++ b/Source/WebCore/rendering/RenderTextControlMultiLine.cpp
>@@ -27,6 +27,7 @@
> #include "HTMLTextAreaElement.h"
> #include "HitTestResult.h"
> #include "ShadowRoot.h"
>+#include "StyleInheritedData.h"
> #include "TextControlInnerElements.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp b/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
>index 3eaae4111168ba07c0297321316cc14227348a09..0a58af605d944c45808a794eaee133423804ccfd 100644
>--- a/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
>+++ b/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
>@@ -25,6 +25,7 @@
> #include "RenderThemeChromiumSkia.h"
> 
> #include "CSSValueKeywords.h"
>+#include "Font.h"
> #include "GraphicsContext.h"
> #include "HTMLMediaElement.h"
> #include "HTMLNames.h"
>diff --git a/Source/WebCore/rendering/RenderView.cpp b/Source/WebCore/rendering/RenderView.cpp
>index 0ea3884f472a19b7914f0e99b4f8706632c85dcc..7bcec0d216618cd80a55f16a1ebe722219c2d843 100644
>--- a/Source/WebCore/rendering/RenderView.cpp
>+++ b/Source/WebCore/rendering/RenderView.cpp
>@@ -38,6 +38,7 @@
> #include "RenderSelectionInfo.h"
> #include "RenderWidget.h"
> #include "RenderWidgetProtector.h"
>+#include "StyleInheritedData.h"
> #include "TransformState.h"
> 
> #if USE(ACCELERATED_COMPOSITING)
>diff --git a/Source/WebCore/rendering/TextAutosizer.cpp b/Source/WebCore/rendering/TextAutosizer.cpp
>index 82399c739e1be2d863ff038404695e2e5fd1b276..aeb90c385177e8091f9b89925de2a9b257b2e59b 100644
>--- a/Source/WebCore/rendering/TextAutosizer.cpp
>+++ b/Source/WebCore/rendering/TextAutosizer.cpp
>@@ -25,11 +25,13 @@
> #include "TextAutosizer.h"
> 
> #include "Document.h"
>+#include "Font.h"
> #include "InspectorInstrumentation.h"
> #include "RenderObject.h"
> #include "RenderText.h"
> #include "RenderView.h"
> #include "Settings.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLBlock.h b/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>index 25ec750399a5d5bb1afadf2fd6182126647c0c52..cd1e26cb234154254c2cc29d7a6b60b8b928d805 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>@@ -30,6 +30,7 @@
> #if ENABLE(MATHML)
> 
> #include "RenderBlock.h"
>+#include "StyleInheritedData.h"
> 
> #define ENABLE_DEBUG_MATH_LAYOUT 0
> 
>diff --git a/Source/WebCore/rendering/style/KeyframeList.h b/Source/WebCore/rendering/style/KeyframeList.h
>index 5101b068929ad29ea5e226bb38ac4089965b52ea..6193fa67dbb6ceb2b6eb35fcdb9249adff24a7bd 100644
>--- a/Source/WebCore/rendering/style/KeyframeList.h
>+++ b/Source/WebCore/rendering/style/KeyframeList.h
>@@ -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>
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index 2303ffa0414d806ddd9197002e0091d87b40d095..54f666bcf80160bce265fafb7a6f337480bd1aa8 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -27,6 +27,7 @@
> #include "CursorList.h"
> #include "CSSPropertyNames.h"
> #include "CSSWrapShapes.h"
>+#include "Font.h"
> #include "FontSelector.h"
> #include "MemoryInstrumentation.h"
> #include "QuotesData.h"
>@@ -35,6 +36,7 @@
> #include "ScaleTransformOperation.h"
> #include "ShadowData.h"
> #include "StyleImage.h"
>+#include "StyleInheritedData.h"
> #include "StyleResolver.h"
> #if ENABLE(TOUCH_EVENTS)
> #include "RenderTheme.h"
>@@ -943,6 +945,23 @@ static float calcConstraintScaleFor(const IntRect& rect, const RoundedRect::Radi
>     return factor;
> }
> 
>+StyleImage* RenderStyle::listStyleImage() const { return inherited->list_style_image.get(); }
>+void RenderStyle::setListStyleImage(PassRefPtr<StyleImage> v)
>+{
>+    if (inherited->list_style_image !=v)
>+        inherited.access()->list_style_image = v;
>+}
>+
>+Color RenderStyle::color() const { return inherited->color; }
>+Color RenderStyle::visitedLinkColor() const { return inherited->visitedLinkColor; }
>+void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v) };
>+void RenderStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v) }
>+
>+short RenderStyle::horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
>+short RenderStyle::verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
>+void RenderStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horizontal_border_spacing, v) }
>+void RenderStyle::setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertical_border_spacing, v) }
>+
> RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, RenderView* renderView, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
> {
>     IntRect snappedBorderRect(pixelSnappedIntRect(borderRect));
>@@ -1165,6 +1184,46 @@ const Animation* RenderStyle::transitionForProperty(CSSPropertyID property) cons
>     return 0;
> }
> 
>+const Font& RenderStyle::font() const { return inherited->font; }
>+const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fontMetrics(); }
>+const FontDescription& RenderStyle::fontDescription() const { return inherited->font.fontDescription(); }
>+int RenderStyle::fontSize() const { return inherited->font.pixelSize(); }
>+
>+int RenderStyle::wordSpacing() const { return inherited->font.wordSpacing(); }
>+int RenderStyle::letterSpacing() const { return inherited->font.letterSpacing(); }
>+
>+bool RenderStyle::setFontDescription(const FontDescription& v)
>+{
>+    if (inherited->font.fontDescription() != v) {
>+        inherited.access()->font = Font(v, inherited->font.letterSpacing(), inherited->font.wordSpacing());
>+        return true;
>+    }
>+    return false;
>+}
>+
>+Length RenderStyle::lineHeight() const { return inherited->line_height; }
>+void RenderStyle::setLineHeight(Length v) { SET_VAR(inherited, line_height, v); }
>+
>+int RenderStyle::computedLineHeight(RenderView* renderView) const
>+{
>+    const Length& lh = inherited->line_height;
>+
>+    // Negative value means the line height is not set. Use the font's built-in spacing.
>+    if (lh.isNegative())
>+        return fontMetrics().lineSpacing();
>+
>+    if (lh.isPercent())
>+        return minimumValueForLength(lh, fontSize());
>+
>+    if (lh.isViewportPercentage())
>+        return valueForLength(lh, 0, renderView);
>+
>+    return lh.value();
>+}
>+
>+void RenderStyle::setWordSpacing(int v) { inherited.access()->font.setWordSpacing(v); }
>+void RenderStyle::setLetterSpacing(int v) { inherited.access()->font.setLetterSpacing(v); }
>+
> void RenderStyle::setBlendedFontSize(int size)
> {
>     FontSelector* currentFontSelector = font().fontSelector();
>diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
>index 78229e9b89a9067628d8796fc952ffb5b38d71d8..b9bc168eccd8ec332ca38e91d86fa0446e5821b0 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.h
>+++ b/Source/WebCore/rendering/style/RenderStyle.h
>@@ -35,7 +35,7 @@
> #include "CounterDirectives.h"
> #include "DataRef.h"
> #include "FillLayer.h"
>-#include "Font.h"
>+#include "FontBaseline.h"
> #include "GraphicsTypes.h"
> #include "Length.h"
> #include "LengthBox.h"
>@@ -53,7 +53,6 @@
> #include "StyleFlexibleBoxData.h"
> #include "StyleGridData.h"
> #include "StyleGridItemData.h"
>-#include "StyleInheritedData.h"
> #include "StyleMarqueeData.h"
> #include "StyleMultiColData.h"
> #include "StyleRareInheritedData.h"
>@@ -104,11 +103,15 @@ using std::max;
> class BorderData;
> class CounterContent;
> class CursorList;
>+class Font;
>+class FontDescription;
>+class FontMetrics;
> class IntRect;
> class MemoryObjectInfo;
> class Pair;
> class ShadowData;
> class StyleImage;
>+class StyleInheritedData;
> class StyleResolver;
> class TransformationMatrix;
> 
>@@ -594,18 +597,18 @@ public:
>     EClear clear() const { return static_cast<EClear>(noninherited_flags._clear); }
>     ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninherited_flags._table_layout); }
> 
>-    const Font& font() const { return inherited->font; }
>-    const FontMetrics& fontMetrics() const { return inherited->font.fontMetrics(); }
>-    const FontDescription& fontDescription() const { return inherited->font.fontDescription(); }
>-    int fontSize() const { return inherited->font.pixelSize(); }
>+    const Font& font() const;
>+    const FontMetrics& fontMetrics() const;
>+    const FontDescription& fontDescription() const;
>+    int fontSize() const;
> 
>     Length textIndent() const { return rareInheritedData->indent; }
>     ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flags._text_align); }
>     ETextTransform textTransform() const { return static_cast<ETextTransform>(inherited_flags._text_transform); }
>     ETextDecoration textDecorationsInEffect() const { return static_cast<ETextDecoration>(inherited_flags._text_decorations); }
>     ETextDecoration textDecoration() const { return static_cast<ETextDecoration>(visual->textDecoration); }
>-    int wordSpacing() const { return inherited->font.wordSpacing(); }
>-    int letterSpacing() const { return inherited->font.letterSpacing(); }
>+    int wordSpacing() const;
>+    int letterSpacing() const;
> 
>     float zoom() const { return visual->m_zoom; }
>     float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
>@@ -613,24 +616,9 @@ public:
>     TextDirection direction() const { return static_cast<TextDirection>(inherited_flags._direction); }
>     bool isLeftToRightDirection() const { return direction() == LTR; }
> 
>-    Length lineHeight() const { return inherited->line_height; }
>-    int computedLineHeight(RenderView* renderView = 0) const
>-    {
>-        const Length& lh = inherited->line_height;
>-
>-        // Negative value means the line height is not set.  Use the font's built-in spacing.
>-        if (lh.isNegative())
>-            return fontMetrics().lineSpacing();
>-
>-        if (lh.isPercent())
>-            return minimumValueForLength(lh, fontSize());
>-
>-        if (lh.isViewportPercentage())
>-            return valueForLength(lh, 0, renderView);
>-
>-        return lh.value();
>-    }
>-
>+    Length lineHeight() const;
>+    int computedLineHeight(RenderView* = 0) const;
>+    
>     EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_flags._white_space); }
>     static bool autoWrap(EWhiteSpace ws)
>     {
>@@ -717,8 +705,8 @@ public:
>     StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_maskBoxImage.image(); }
>  
>     EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(inherited_flags._border_collapse); }
>-    short horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
>-    short verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
>+    short horizontalBorderSpacing() const;
>+    short verticalBorderSpacing() const;
>     EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); }
>     ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); }
> 
>@@ -726,7 +714,7 @@ public:
>     short counterReset() const { return rareNonInheritedData->m_counterReset; }
> 
>     EListStyleType listStyleType() const { return static_cast<EListStyleType>(inherited_flags._list_style_type); }
>-    StyleImage* listStyleImage() const { return inherited->list_style_image.get(); }
>+    StyleImage* listStyleImage() const;
>     EListStylePosition listStylePosition() const { return static_cast<EListStylePosition>(inherited_flags._list_style_position); }
> 
>     Length marginTop() const { return surround->margin.top(); }
>@@ -1116,19 +1104,12 @@ public:
>     void setClear(EClear v) { noninherited_flags._clear = v; }
>     void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; }
> 
>-    bool setFontDescription(const FontDescription& v)
>-    {
>-        if (inherited->font.fontDescription() != v) {
>-            inherited.access()->font = Font(v, inherited->font.letterSpacing(), inherited->font.wordSpacing());
>-            return true;
>-        }
>-        return false;
>-    }
>+    bool setFontDescription(const FontDescription& v);
> 
>     // Only used for blending font sizes when animating, or MathML anonymous blocks.
>     void setBlendedFontSize(int);
> 
>-    void setColor(const Color& v) { SET_VAR(inherited, color, v) }
>+    void setColor(const Color& v);
>     void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v) }
>     void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
>     void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
>@@ -1136,7 +1117,7 @@ public:
>     void setTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_decorations = v; }
>     void setTextDecoration(ETextDecoration v) { SET_VAR(visual, textDecoration, v); }
>     void setDirection(TextDirection v) { inherited_flags._direction = v; }
>-    void setLineHeight(Length v) { SET_VAR(inherited, line_height, v) }
>+    void setLineHeight(Length v);
>     bool setZoom(float);
>     void setZoomWithoutReturnValue(float f) { setZoom(f); }
>     bool setEffectiveZoom(float);
>@@ -1155,8 +1136,8 @@ public:
> 
>     void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
> 
>-    void setWordSpacing(int v) { inherited.access()->font.setWordSpacing(v); }
>-    void setLetterSpacing(int v) { inherited.access()->font.setLetterSpacing(v); }
>+    void setWordSpacing(int v);
>+    void setLetterSpacing(int v);
> 
>     void clearBackgroundLayers() { m_background.access()->m_background = FillLayer(BackgroundFillLayer); }
>     void inheritBackgroundLayers(const FillLayer& parent) { m_background.access()->m_background = parent; }
>@@ -1189,8 +1170,8 @@ public:
>     void setMaskSize(LengthSize l) { SET_VAR(rareNonInheritedData, m_mask.m_sizeLength, l) }
> 
>     void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_collapse = collapse; }
>-    void setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horizontal_border_spacing, v) }
>-    void setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertical_border_spacing, v) }
>+    void setHorizontalBorderSpacing(short);
>+    void setVerticalBorderSpacing(short);
>     void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
>     void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
> 
>@@ -1201,7 +1182,7 @@ public:
>     void setCounterReset(short v) { SET_VAR(rareNonInheritedData, m_counterReset, v) }
> 
>     void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }
>-    void setListStyleImage(PassRefPtr<StyleImage> v) { if (inherited->list_style_image != v) inherited.access()->list_style_image = v; }
>+    void setListStyleImage(PassRefPtr<StyleImage> v);
>     void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
> 
>     void resetMargin() { SET_VAR(surround, margin, LengthBox(Fixed)) }
>@@ -1713,7 +1694,7 @@ public:
>     static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
> #endif
> private:
>-    void setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v) }
>+    void setVisitedLinkColor(const Color&);
>     void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v) }
>     void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderLeftColor, v) }
>     void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderRightColor, v) }
>@@ -1755,13 +1736,13 @@ private:
>     Color borderTopColor() const { return surround->border.top().color(); }
>     Color borderBottomColor() const { return surround->border.bottom().color(); }
>     Color backgroundColor() const { return m_background->color(); }
>-    Color color() const { return inherited->color; }
>+    Color color() const;
>     Color columnRuleColor() const { return rareNonInheritedData->m_multiCol->m_rule.color(); }
>     Color outlineColor() const { return m_background->outline().color(); }
>     Color textEmphasisColor() const { return rareInheritedData->textEmphasisColor; }
>     Color textFillColor() const { return rareInheritedData->textFillColor; }
>     Color textStrokeColor() const { return rareInheritedData->textStrokeColor; }
>-    Color visitedLinkColor() const { return inherited->visitedLinkColor; }
>+    Color visitedLinkColor() const;
>     Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_visitedLinkBackgroundColor; }
>     Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_visitedLinkBorderLeftColor; }
>     Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_visitedLinkBorderRightColor; }
>diff --git a/Source/WebCore/rendering/style/StyleInheritedData.cpp b/Source/WebCore/rendering/style/StyleInheritedData.cpp
>index ad14cbbfa831e37175347af017118220926be809..021740f1563e230d989756b7d3265e70969a7a86 100644
>--- a/Source/WebCore/rendering/style/StyleInheritedData.cpp
>+++ b/Source/WebCore/rendering/style/StyleInheritedData.cpp
>@@ -20,7 +20,7 @@
>  */
> 
> #include "config.h"
>-#include "StyleRareInheritedData.h"
>+#include "StyleInheritedData.h"
> 
> #include "RenderStyle.h"
> #include "StyleImage.h"
>diff --git a/Source/WebCore/rendering/svg/RenderSVGBlock.cpp b/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
>index c4f9a284d6d5da0b6f5d36527151186d676f07f2..361279415aade6298e3d22c05ff6a4fe3ced9408 100644
>--- a/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
>+++ b/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
>@@ -27,6 +27,7 @@
> #include "RenderSVGResource.h"
> #include "SVGElement.h"
> #include "SVGResourcesCache.h"
>+#include "StyleInheritedData.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/svg/RenderSVGInlineText.h b/Source/WebCore/rendering/svg/RenderSVGInlineText.h
>index ab81ca99fa693947fd45f9ccd0e00eb2873b881a..7643cf1abde1f97ce2843513d5eb8934d3c96538 100644
>--- a/Source/WebCore/rendering/svg/RenderSVGInlineText.h
>+++ b/Source/WebCore/rendering/svg/RenderSVGInlineText.h
>@@ -23,6 +23,7 @@
> #define RenderSVGInlineText_h
> 
> #if ENABLE(SVG)
>+#include "Font.h"
> #include "RenderText.h"
> #include "SVGTextLayoutAttributes.h"
> 
>diff --git a/Source/WebCore/svg/SVGLengthContext.cpp b/Source/WebCore/svg/SVGLengthContext.cpp
>index d33de3456a8a8323908eae69c55d032aed4d536a..51b4900fc8caa71e853081d4ef24aa40cbf259b6 100644
>--- a/Source/WebCore/svg/SVGLengthContext.cpp
>+++ b/Source/WebCore/svg/SVGLengthContext.cpp
>@@ -27,6 +27,7 @@
> 
> #include "CSSHelper.h"
> #include "ExceptionCode.h"
>+#include "FontMetrics.h"
> #include "Frame.h"
> #include "RenderPart.h"
> #include "RenderSVGRoot.h"
>diff --git a/Source/WebCore/svg/SVGTRefElement.cpp b/Source/WebCore/svg/SVGTRefElement.cpp
>index dc023162e95973e3c6ab5c6256f635fcc141a1c8..fc2b85c3301597184dd620b657be959ed4b6b845 100644
>--- a/Source/WebCore/svg/SVGTRefElement.cpp
>+++ b/Source/WebCore/svg/SVGTRefElement.cpp
>@@ -36,6 +36,7 @@
> #include "SVGDocument.h"
> #include "SVGElementInstance.h"
> #include "SVGNames.h"
>+#include "StyleInheritedData.h"
> #include "Text.h"
> #include "XLinkNames.h"
> 
>diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
>index 62ea2ee7070ee667e6e04a30dd0cdc3bc90d6f1e..39362df5b68bde87443884bf6650e2474954c543 100644
>--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
>@@ -138,6 +138,7 @@
> #include "ShadowRoot.h"
> #include "SkiaUtils.h"
> #include "SpellChecker.h"
>+#include "StyleInheritedData.h"
> #include "SubstituteData.h"
> #include "TextAffinity.h"
> #include "TextIterator.h"
>diff --git a/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm b/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm
>index 7fd19f53621c26eef682013a3a2d579292352660..dd9951f83434648c6a480ff21470c63fdc9e92cf 100644
>--- a/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm
>+++ b/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm
>@@ -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"
>diff --git a/Source/WebKit/win/DOMCoreClasses.cpp b/Source/WebKit/win/DOMCoreClasses.cpp
>index 26d6ea52dd7b536a14cb8fbc837772372045e84c..42fb2e051045b199752b731192420c8210fd2b9f 100644
>--- a/Source/WebKit/win/DOMCoreClasses.cpp
>+++ b/Source/WebKit/win/DOMCoreClasses.cpp
>@@ -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>
>diff --git a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
>index 43d381ecd36d76101708f69b71afc91583206ef2..9ec6356114da09ee44c4f3dbd2ca07f7007b7793 100644
>--- a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
>+++ b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
>@@ -44,6 +44,7 @@
> #import <PDFKit/PDFKit.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/FocusController.h>
>+#import <WebCore/Font.h>
> #import <WebCore/Frame.h>
> #import <WebCore/FrameView.h>
> #import <WebCore/HitTestResult.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 93629: 157481 | 157493 | 157757 | 157760 | 157762 | 157764 | 157765 | 157767 | 157778 | 157783 | 157845 | 158029 | 158056 | 158183 | 158357 | 158453 | 158657 | 160003 | 160004