Reduce Font.h includes across project -- improves RenderObject.h compile time

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: http://svn.webkit.org/repository/webkit/trunk@126359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1bd12baa
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
......@@ -33,6 +33,7 @@
#include "AccessibilityObject.h"
#include "Document.h"
#include "Font.h"
#include "FrameView.h"
#include <wtf/gobject/GOwnPtr.h>
#include "HostWindow.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -32,6 +32,7 @@
#include "MutationRecord.h"
#include "NodeRenderingContext.h"
#include "RenderText.h"
#include "StyleInheritedData.h"
#include "TextBreakIterator.h"
#include "UndoManager.h"
......
......@@ -29,6 +29,7 @@
#include "HTMLCollection.h"
#include "NamedNodeMap.h"
#include "NodeRareData.h"
#include "StyleInheritedData.h"
#include <wtf/OwnPtr.h>
namespace WebCore {
......
......@@ -40,6 +40,7 @@
#include "RenderObject.h"
#include "RenderView.h"
#include "ShadowRoot.h"
#include "StyleInheritedData.h"
#if ENABLE(SVG)
#include "SVGNames.h"
......
......@@ -32,6 +32,7 @@
#include "SVGNames.h"
#endif
#include "StyleInheritedData.h"
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
......
......@@ -28,6 +28,7 @@
#include "TextIterator.h"
#include "Document.h"
#include "Font.h"
#include "Frame.h"
#include "HTMLElement.h"
#include "HTMLTextFormControlElement.h"
......
......@@ -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"
......
......@@ -27,6 +27,7 @@
#include "HTMLNames.h"
#include "NodeRenderingContext.h"
#include "RenderStyle.h"
#include "StyleInheritedData.h"
#include "Text.h"
namespace WebCore {
......
......@@ -42,6 +42,7 @@
#include "ScriptController.h"
#include "SpeechInput.h"
#include "SpeechInputEvent.h"
#include "StyleInheritedData.h"
#include "TextEvent.h"
#include "TextEventInputType.h"
......
......@@ -33,6 +33,7 @@
#include "InspectorOverlay.h"
#include "Element.h"
#include "Font.h"
#include "FontCache.h"
#include "FontFamily.h"
#include "Frame.h"
......
......@@ -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)
......
......@@ -25,6 +25,7 @@
#include "Frame.h"
#include "FrameView.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
#include <wtf/text/WTFString.h>
namespace WebCore {
......
......@@ -27,6 +27,7 @@
#include "RenderThemeEfl.h"
#include "CSSValueKeywords.h"
#include "FontDescription.h"
#include "GraphicsContext.h"
#include "HTMLInputElement.h"
#include "InputType.h"
......
......@@ -20,6 +20,7 @@
#ifndef FontMetrics_h
#define FontMetrics_h
#include "FontBaseline.h"
#include <wtf/MathExtras.h>
namespace WebCore {
......
......@@ -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"
......
......@@ -32,6 +32,7 @@
#undef GTK_DISABLE_DEPRECATED
#include "CSSValueKeywords.h"
#include "Font.h"
#include "GraphicsContext.h"
#include "GtkVersioning.h"
#include "HTMLNames.h"
......
......@@ -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"
......
......@@ -21,6 +21,7 @@
#include "EllipsisBox.h"
#include "Document.h"
#include "Font.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "InlineTextBox.h"
......
......@@ -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>
......
......@@ -20,6 +20,7 @@
#include "config.h"
#include "InlineBox.h"
#include "FontMetrics.h"
#include "Frame.h"
#include "HitTestResult.h"
#include "InlineFlowBox.h"
......
......@@ -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"
......
......@@ -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 {
......
......@@ -27,6 +27,7 @@
#include "HTMLNames.h"
#include "RenderTextFragment.h"
#include "RenderTheme.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -22,6 +22,7 @@
#include "RenderCombineText.h"
#include "RenderBlock.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -21,6 +21,7 @@
#ifndef RenderCombineText_h
#define RenderCombineText_h
#include "Font.h"
#include "RenderText.h"
namespace WebCore {
......
......@@ -25,6 +25,7 @@
#include "config.h"
#include "RenderDeprecatedFlexibleBox.h"
#include "Font.h"
#include "LayoutRepainter.h"
#include "RenderLayer.h"
#include "RenderView.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.
......
......@@ -23,6 +23,7 @@
#include "ElementShadow.h"
#include "FileList.h"
#include "Font.h"
#include "GraphicsContext.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
......
......@@ -28,6 +28,7 @@
#if ENABLE(FULLSCREEN_API)
#include "RenderDeprecatedFlexibleBox.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -29,6 +29,7 @@
#include "RenderImage.h"
#include "BitmapImage.h"
#include "Font.h"
#include "FontCache.h"
#include "Frame.h"
#include "FrameSelection.h"
......
......@@ -36,6 +36,7 @@
#include "RenderLayer.h"
#include "RenderTheme.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
#include "TransformState.h"
#include "VisiblePosition.h"
......
......@@ -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>
......
......@@ -27,6 +27,7 @@
#include "CachedImage.h"
#include "Document.h"
#include "Font.h"
#include "GraphicsContext.h"
#include "RenderLayer.h"
#include "RenderListItem.h"
......
......@@ -27,6 +27,7 @@
#include "RenderMultiColumnBlock.h"
#include "RenderMultiColumnFlowThread.h"
#include "RenderMultiColumnSet.h"
#include "StyleInheritedData.h"
using namespace std;
......
......@@ -31,6 +31,7 @@
#define RenderRegion_h
#include "RenderReplaced.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -34,6 +34,7 @@
#include "RenderRubyRun.h"
#include "RenderStyle.h"
#include "StyleInheritedData.h"
#include <wtf/RefPtr.h>
namespace WebCore {
......
......@@ -36,6 +36,7 @@
#include "RenderRubyText.h"
#include "RenderText.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
using namespace std;
......
......@@ -31,6 +31,7 @@
#include "RenderPart.h"
#include "RenderScrollbarPart.h"
#include "RenderScrollbarTheme.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -41,6 +41,7 @@
#include "RenderTableCol.h"
#include "RenderTableSection.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
using namespace std;
......
......@@ -33,6 +33,7 @@
#include "PaintInfo.h"
#include "RenderTableCol.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
#include "TransformState.h"
using namespace std;
......
......@@ -32,6 +32,7 @@
#include "PaintInfo.h"
#include "RenderTableCell.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -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>
......
......@@ -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>
......
......@@ -27,6 +27,7 @@
#include "HTMLTextAreaElement.h"
#include "HitTestResult.h"
#include "ShadowRoot.h"
#include "StyleInheritedData.h"
#include "TextControlInnerElements.h"
namespace WebCore {
......
......@@ -25,6 +25,7 @@
#include "RenderThemeChromiumSkia.h"
#include "CSSValueKeywords.h"
#include "Font.h"
#include "GraphicsContext.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
......
......@@ -38,6 +38,7 @@
#include "RenderSelectionInfo.h"
#include "RenderWidget.h"
#include "RenderWidgetProtector.h"
#include "StyleInheritedData.h"
#include "TransformState.h"
#if USE(ACCELERATED_COMPOSITING)
......
......@@ -31,6 +31,7 @@
#include "RenderText.h"
#include "RenderView.h"
#include "Settings.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -30,6 +30,7 @@
#if ENABLE(MATHML)
#include "RenderBlock.h"
#include "StyleInheritedData.h"
#define ENABLE_DEBUG_MATH_LAYOUT 0
......
......@@ -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>
......
......@@ -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"
......
......@@ -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;
......
......@@ -20,7 +20,7 @@
*/
#include "config.h"
#include "StyleRareInheritedData.h"
#include "StyleInheritedData.h"
#include "RenderStyle.h"
#include "StyleImage.h"
......
......@@ -27,6 +27,7 @@
#include "RenderSVGResource.h"
#include "SVGElement.h"
#include "SVGResourcesCache.h"
#include "StyleInheritedData.h"
namespace WebCore {
......
......@@ -23,6 +23,7 @@
#define RenderSVGInlineText_h
#if ENABLE(SVG)
#include "Font.h"
#include "RenderText.h"
#include "SVGTextLayoutAttributes.h"
......
......@@ -27,6 +27,7 @@
#include "CSSHelper.h"
#include "ExceptionCode.h"
#include "FontMetrics.h"
#include "Frame.h"
#include "RenderPart.h"
#include "RenderSVGRoot.h"
......
......@@ -36,6 +36,7 @@
#include "SVGDocument.h"
#include "SVGElementInstance.h"
#include "SVGNames.h"
#include "StyleInheritedData.h"
#include "Text.h"
#include "XLinkNames.h"
......
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
......
......@@ -140,6 +140,7 @@
#include "ShadowRoot.h"
#include "SkiaUtils.h"
#include "SpellChecker.h"
#include "StyleInheritedData.h"
#include "SubstituteData.h"
#include "TextAffinity.h"
#include "TextIterator.h"
......
......@@ -36,6 +36,7 @@
#include "ColorMac.h"
#include "Document.h"
#include "Element.h"