[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
tonyg at chromium.org
tonyg at chromium.org
Sun Feb 20 22:59:29 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit b138b1e322c83baa42959dc2b8af556aa7e162fe
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 00:27:07 2011 +0000
2011-01-14 Tony Gentilcore <tonyg at chromium.org>
Reviewed by David Levin.
Do some forward declaration in RenderStyle.h
https://bugs.webkit.org/show_bug.cgi?id=52453
No new tests because no new functionality.
* css/CSSComputedStyleDeclaration.cpp:
* css/CSSStyleSelector.cpp:
* editing/Editor.cpp:
* page/EventHandler.cpp:
* rendering/EllipsisBox.cpp:
* rendering/InlineBox.cpp:
* rendering/InlineTextBox.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderBlock.h:
* rendering/RenderBox.cpp:
* rendering/RenderBox.h:
* rendering/RenderEmbeddedObject.cpp:
* rendering/RenderFieldset.cpp:
* rendering/RenderFileUploadControl.cpp:
* rendering/RenderFrameSet.cpp:
* rendering/RenderHTMLCanvas.cpp:
* rendering/RenderImageResource.cpp:
* rendering/RenderInputSpeech.cpp:
* rendering/RenderLayer.h:
* rendering/RenderLineBoxList.cpp:
* rendering/RenderListBox.cpp:
* rendering/RenderMediaControlsChromium.cpp:
* rendering/RenderObject.cpp:
* rendering/RenderObject.h:
* rendering/RenderObjectChildList.cpp:
* rendering/RenderProgress.cpp:
* rendering/RenderScrollbarPart.cpp:
* rendering/RenderTable.cpp:
* rendering/RenderTable.h:
* rendering/RenderTableCell.cpp:
* rendering/RenderTableRow.cpp:
* rendering/RenderTableSection.cpp:
* rendering/RenderTheme.cpp:
* rendering/RenderThemeChromiumSkia.cpp:
* rendering/RenderThemeChromiumWin.cpp:
* rendering/RootInlineBox.cpp:
* rendering/style/RenderStyle.cpp:
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75837 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 06bc01a..c488fd7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,52 @@
+2011-01-14 Tony Gentilcore <tonyg at chromium.org>
+
+ Reviewed by David Levin.
+
+ Do some forward declaration in RenderStyle.h
+ https://bugs.webkit.org/show_bug.cgi?id=52453
+
+ No new tests because no new functionality.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ * css/CSSStyleSelector.cpp:
+ * editing/Editor.cpp:
+ * page/EventHandler.cpp:
+ * rendering/EllipsisBox.cpp:
+ * rendering/InlineBox.cpp:
+ * rendering/InlineTextBox.cpp:
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderBlock.h:
+ * rendering/RenderBox.cpp:
+ * rendering/RenderBox.h:
+ * rendering/RenderEmbeddedObject.cpp:
+ * rendering/RenderFieldset.cpp:
+ * rendering/RenderFileUploadControl.cpp:
+ * rendering/RenderFrameSet.cpp:
+ * rendering/RenderHTMLCanvas.cpp:
+ * rendering/RenderImageResource.cpp:
+ * rendering/RenderInputSpeech.cpp:
+ * rendering/RenderLayer.h:
+ * rendering/RenderLineBoxList.cpp:
+ * rendering/RenderListBox.cpp:
+ * rendering/RenderMediaControlsChromium.cpp:
+ * rendering/RenderObject.cpp:
+ * rendering/RenderObject.h:
+ * rendering/RenderObjectChildList.cpp:
+ * rendering/RenderProgress.cpp:
+ * rendering/RenderScrollbarPart.cpp:
+ * rendering/RenderTable.cpp:
+ * rendering/RenderTable.h:
+ * rendering/RenderTableCell.cpp:
+ * rendering/RenderTableRow.cpp:
+ * rendering/RenderTableSection.cpp:
+ * rendering/RenderTheme.cpp:
+ * rendering/RenderThemeChromiumSkia.cpp:
+ * rendering/RenderThemeChromiumWin.cpp:
+ * rendering/RootInlineBox.cpp:
+ * rendering/style/RenderStyle.cpp:
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+
2011-01-14 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Eric Seidel.
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index b9420f5..65abe3b 100644
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -24,6 +24,7 @@
#include "CSSComputedStyleDeclaration.h"
#include "AnimationController.h"
+#include "CursorList.h"
#include "CSSBorderImageValue.h"
#include "CSSMutableStyleDeclaration.h"
#include "CSSPrimitiveValue.h"
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp
index b9f9bab..93db2f4 100644
--- a/Source/WebCore/css/CSSStyleSelector.cpp
+++ b/Source/WebCore/css/CSSStyleSelector.cpp
@@ -27,6 +27,9 @@
#include "CSSStyleSelector.h"
#include "Attribute.h"
+#include "ContentData.h"
+#include "CounterContent.h"
+#include "CursorList.h"
#include "CSSBorderImageValue.h"
#include "CSSCursorImageValue.h"
#include "CSSFontFaceRule.h"
diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
index a24e7c6..93fdd3c 100644
--- a/Source/WebCore/editing/Editor.cpp
+++ b/Source/WebCore/editing/Editor.cpp
@@ -52,6 +52,7 @@
#include "Frame.h"
#include "FrameTree.h"
#include "FrameView.h"
+#include "GraphicsContext.h"
#include "HTMLFrameOwnerElement.h"
#include "HTMLInputElement.h"
#include "HTMLTextAreaElement.h"
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index d0f1756..fec1793 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -32,6 +32,7 @@
#include "Chrome.h"
#include "ChromeClient.h"
#include "Cursor.h"
+#include "CursorList.h"
#include "Document.h"
#include "DragController.h"
#include "Editor.h"
diff --git a/Source/WebCore/page/chromium/FrameChromium.cpp b/Source/WebCore/page/chromium/FrameChromium.cpp
index 15ff8b4..f6f47a6 100644
--- a/Source/WebCore/page/chromium/FrameChromium.cpp
+++ b/Source/WebCore/page/chromium/FrameChromium.cpp
@@ -28,6 +28,7 @@
#include "Document.h"
#include "FloatRect.h"
+#include "GraphicsContext.h"
#include "ImageBuffer.h"
#include "RenderView.h"
#include "Settings.h"
diff --git a/Source/WebCore/page/qt/FrameQt.cpp b/Source/WebCore/page/qt/FrameQt.cpp
index 467592c..bb577e0 100644
--- a/Source/WebCore/page/qt/FrameQt.cpp
+++ b/Source/WebCore/page/qt/FrameQt.cpp
@@ -24,6 +24,7 @@
#include "config.h"
#include "Frame.h"
#include "FrameView.h"
+#include "GraphicsContext.h"
#include "Image.h"
#include "ImageBuffer.h"
diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
index 276fb8f..97c966d 100644
--- a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -33,6 +33,7 @@
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "MediaControlElements.h"
+#include "PaintInfo.h"
#include "RenderBox.h"
#include "RenderObject.h"
#include "TimeRanges.h"
diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
index cc6299e..e01508e 100644
--- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
+++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
@@ -32,6 +32,7 @@
#include "GtkVersioning.h"
#include "HTMLNames.h"
#include "MediaControlElements.h"
+#include "PaintInfo.h"
#include "RenderObject.h"
#include "TextDirection.h"
#include "UserAgentStyleSheets.h"
diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
index 269f0fd..212e29d 100644
--- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
+++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
@@ -33,6 +33,7 @@
#include "HTMLNames.h"
#include "MediaControlElements.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderObject.h"
#include "TextDirection.h"
#include "UserAgentStyleSheets.h"
diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp
index de3fd8f..8d5cfcd 100644
--- a/Source/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQt.cpp
@@ -47,6 +47,7 @@
#include "QtMobileWebStyle.h"
#endif
#include "NotImplemented.h"
+#include "PaintInfo.h"
#include "Page.h"
#include "QWebPageClient.h"
#include "QtStyleOptionWebComboBox.h"
diff --git a/Source/WebCore/rendering/EllipsisBox.cpp b/Source/WebCore/rendering/EllipsisBox.cpp
index f9c4f03..39fa205 100644
--- a/Source/WebCore/rendering/EllipsisBox.cpp
+++ b/Source/WebCore/rendering/EllipsisBox.cpp
@@ -23,6 +23,7 @@
#include "Document.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
+#include "PaintInfo.h"
#include "RootInlineBox.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp
index 145096b..bbf5a74 100644
--- a/Source/WebCore/rendering/InlineBox.cpp
+++ b/Source/WebCore/rendering/InlineBox.cpp
@@ -22,6 +22,7 @@
#include "HitTestResult.h"
#include "InlineFlowBox.h"
+#include "PaintInfo.h"
#include "RenderArena.h"
#include "RenderBlock.h"
#include "RootInlineBox.h"
diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
index 5978f8e..9d993e7 100644
--- a/Source/WebCore/rendering/InlineTextBox.cpp
+++ b/Source/WebCore/rendering/InlineTextBox.cpp
@@ -33,6 +33,7 @@
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderArena.h"
#include "RenderBlock.h"
#include "RenderRubyRun.h"
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
index 4d5e9f8..3dffff6 100644
--- a/Source/WebCore/rendering/RenderBlock.cpp
+++ b/Source/WebCore/rendering/RenderBlock.cpp
@@ -35,6 +35,7 @@
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "InlineTextBox.h"
+#include "PaintInfo.h"
#include "RenderFlexibleBox.h"
#include "RenderImage.h"
#include "RenderInline.h"
diff --git a/Source/WebCore/rendering/RenderBlock.h b/Source/WebCore/rendering/RenderBlock.h
index d2820aa..9529bd6 100644
--- a/Source/WebCore/rendering/RenderBlock.h
+++ b/Source/WebCore/rendering/RenderBlock.h
@@ -38,6 +38,7 @@ class LayoutStateMaintainer;
class RenderInline;
struct BidiRun;
+struct PaintInfo;
template <class Iterator, class Run> class BidiResolver;
template <class Iterator> struct MidpointState;
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index dc6d05f..3d367aa 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -39,6 +39,7 @@
#include "FloatQuad.h"
#include "Frame.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderArena.h"
#include "RenderFlexibleBox.h"
#include "RenderInline.h"
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
index 67ac103..e784b93 100644
--- a/Source/WebCore/rendering/RenderBox.h
+++ b/Source/WebCore/rendering/RenderBox.h
@@ -29,6 +29,8 @@
namespace WebCore {
+struct PaintInfo;
+
enum LogicalWidthType { LogicalWidth, MinLogicalWidth, MaxLogicalWidth };
class RenderBox : public RenderBoxModelObject {
diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
index fa31ddf..ac72fe1 100644
--- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp
+++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
@@ -41,6 +41,7 @@
#include "MIMETypeRegistry.h"
#include "MouseEvent.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "Path.h"
#include "PluginViewBase.h"
#include "RenderTheme.h"
diff --git a/Source/WebCore/rendering/RenderFieldset.cpp b/Source/WebCore/rendering/RenderFieldset.cpp
index fd91472..8c65314 100644
--- a/Source/WebCore/rendering/RenderFieldset.cpp
+++ b/Source/WebCore/rendering/RenderFieldset.cpp
@@ -25,8 +25,9 @@
#include "RenderFieldset.h"
#include "CSSPropertyNames.h"
-#include "HTMLNames.h"
#include "GraphicsContext.h"
+#include "HTMLNames.h"
+#include "PaintInfo.h"
#if ENABLE(WML)
#include "WMLNames.h"
diff --git a/Source/WebCore/rendering/RenderFileUploadControl.cpp b/Source/WebCore/rendering/RenderFileUploadControl.cpp
index 8c50677..3e4d216 100644
--- a/Source/WebCore/rendering/RenderFileUploadControl.cpp
+++ b/Source/WebCore/rendering/RenderFileUploadControl.cpp
@@ -32,6 +32,7 @@
#include "Icon.h"
#include "LocalizedStrings.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderButton.h"
#include "RenderText.h"
#include "RenderTheme.h"
diff --git a/Source/WebCore/rendering/RenderFrameSet.cpp b/Source/WebCore/rendering/RenderFrameSet.cpp
index 52c4cdd..498cbd7 100644
--- a/Source/WebCore/rendering/RenderFrameSet.cpp
+++ b/Source/WebCore/rendering/RenderFrameSet.cpp
@@ -34,6 +34,7 @@
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "MouseEvent.h"
+#include "PaintInfo.h"
#include "RenderFrame.h"
#include "RenderView.h"
#include "Settings.h"
diff --git a/Source/WebCore/rendering/RenderHTMLCanvas.cpp b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
index 68bb536..de2a2c1 100644
--- a/Source/WebCore/rendering/RenderHTMLCanvas.cpp
+++ b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -28,11 +28,12 @@
#include "CanvasRenderingContext.h"
#include "Document.h"
+#include "FrameView.h"
#include "GraphicsContext.h"
#include "HTMLCanvasElement.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
#include "RenderView.h"
-#include "FrameView.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/RenderImageResource.cpp b/Source/WebCore/rendering/RenderImageResource.cpp
index ea3ed2f..a943c3d 100644
--- a/Source/WebCore/rendering/RenderImageResource.cpp
+++ b/Source/WebCore/rendering/RenderImageResource.cpp
@@ -28,6 +28,7 @@
#include "config.h"
#include "RenderImageResource.h"
+#include "Image.h"
#include "RenderImageResourceStyleImage.h"
#include "RenderObject.h"
diff --git a/Source/WebCore/rendering/RenderInputSpeech.cpp b/Source/WebCore/rendering/RenderInputSpeech.cpp
index 5472025..8a1e73f 100644
--- a/Source/WebCore/rendering/RenderInputSpeech.cpp
+++ b/Source/WebCore/rendering/RenderInputSpeech.cpp
@@ -35,6 +35,7 @@
#include "GraphicsContext.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
#include "RenderBox.h"
#include "TextControlInnerElements.h"
diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
index 55364f1..1b60594 100644
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -44,6 +44,7 @@
#ifndef RenderLayer_h
#define RenderLayer_h
+#include "PaintInfo.h"
#include "RenderBox.h"
#include "ScrollBehavior.h"
#include "ScrollbarClient.h"
diff --git a/Source/WebCore/rendering/RenderLineBoxList.cpp b/Source/WebCore/rendering/RenderLineBoxList.cpp
index 85d7f18..1488ecc 100644
--- a/Source/WebCore/rendering/RenderLineBoxList.cpp
+++ b/Source/WebCore/rendering/RenderLineBoxList.cpp
@@ -31,6 +31,7 @@
#include "HitTestResult.h"
#include "InlineTextBox.h"
+#include "PaintInfo.h"
#include "RenderArena.h"
#include "RenderInline.h"
#include "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderListBox.cpp b/Source/WebCore/rendering/RenderListBox.cpp
index a7cf075..e6ce340 100644
--- a/Source/WebCore/rendering/RenderListBox.cpp
+++ b/Source/WebCore/rendering/RenderListBox.cpp
@@ -46,6 +46,7 @@
#include "OptionGroupElement.h"
#include "OptionElement.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderScrollbar.h"
#include "RenderTheme.h"
#include "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderMediaControlsChromium.cpp b/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
index f938a52..71fca91 100644
--- a/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
+++ b/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
@@ -32,6 +32,7 @@
#include "GraphicsContext.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index c7c81f9..97ac5c3 100644
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -28,8 +28,9 @@
#include "RenderObject.h"
#include "AXObjectCache.h"
-#include "Chrome.h"
#include "CSSStyleSelector.h"
+#include "Chrome.h"
+#include "ContentData.h"
#include "DashArray.h"
#include "EditingBoundary.h"
#include "FloatQuad.h"
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h
index 2f443ef..cf08a0d 100644
--- a/Source/WebCore/rendering/RenderObject.h
+++ b/Source/WebCore/rendering/RenderObject.h
@@ -28,11 +28,10 @@
#include "AffineTransform.h"
#include "CachedResourceClient.h"
-#include "CSSPrimitiveValue.h"
#include "Document.h"
#include "Element.h"
#include "FloatQuad.h"
-#include "PaintInfo.h"
+#include "PaintPhase.h"
#include "RenderObjectChildList.h"
#include "RenderStyle.h"
#include "TextAffinity.h"
@@ -64,6 +63,8 @@ class VisiblePosition;
class RenderSVGResourceContainer;
#endif
+struct PaintInfo;
+
enum HitTestFilter {
HitTestAll,
HitTestSelf,
diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp
index c7c8e44..fa4f902 100644
--- a/Source/WebCore/rendering/RenderObjectChildList.cpp
+++ b/Source/WebCore/rendering/RenderObjectChildList.cpp
@@ -28,6 +28,7 @@
#include "RenderObjectChildList.h"
#include "AXObjectCache.h"
+#include "ContentData.h"
#include "RenderBlock.h"
#include "RenderCounter.h"
#include "RenderImage.h"
diff --git a/Source/WebCore/rendering/RenderProgress.cpp b/Source/WebCore/rendering/RenderProgress.cpp
index 84de6fb..4194e2b 100644
--- a/Source/WebCore/rendering/RenderProgress.cpp
+++ b/Source/WebCore/rendering/RenderProgress.cpp
@@ -26,6 +26,7 @@
#include "HTMLNames.h"
#include "HTMLProgressElement.h"
+#include "PaintInfo.h"
#include "RenderTheme.h"
#include "ShadowElement.h"
#include <wtf/CurrentTime.h>
diff --git a/Source/WebCore/rendering/RenderScrollbarPart.cpp b/Source/WebCore/rendering/RenderScrollbarPart.cpp
index 16cc204..9cf55fc 100644
--- a/Source/WebCore/rendering/RenderScrollbarPart.cpp
+++ b/Source/WebCore/rendering/RenderScrollbarPart.cpp
@@ -25,6 +25,8 @@
#include "config.h"
#include "RenderScrollbarPart.h"
+
+#include "PaintInfo.h"
#include "RenderScrollbar.h"
#include "RenderScrollbarTheme.h"
#include "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderTable.cpp b/Source/WebCore/rendering/RenderTable.cpp
index ade0450..3534d9a 100644
--- a/Source/WebCore/rendering/RenderTable.cpp
+++ b/Source/WebCore/rendering/RenderTable.cpp
@@ -27,6 +27,7 @@
#include "RenderTable.h"
#include "AutoTableLayout.h"
+#include "CollapsedBorderValue.h"
#include "DeleteButtonController.h"
#include "Document.h"
#include "FixedTableLayout.h"
diff --git a/Source/WebCore/rendering/RenderTable.h b/Source/WebCore/rendering/RenderTable.h
index 2bda68e..b8a37f2 100644
--- a/Source/WebCore/rendering/RenderTable.h
+++ b/Source/WebCore/rendering/RenderTable.h
@@ -31,6 +31,7 @@
namespace WebCore {
+class CollapsedBorderValue;
class RenderTableCol;
class RenderTableCell;
class RenderTableSection;
diff --git a/Source/WebCore/rendering/RenderTableCell.cpp b/Source/WebCore/rendering/RenderTableCell.cpp
index 428d2c3..90d9865 100644
--- a/Source/WebCore/rendering/RenderTableCell.cpp
+++ b/Source/WebCore/rendering/RenderTableCell.cpp
@@ -25,10 +25,12 @@
#include "config.h"
#include "RenderTableCell.h"
+#include "CollapsedBorderValue.h"
#include "FloatQuad.h"
#include "GraphicsContext.h"
#include "HTMLNames.h"
#include "HTMLTableCellElement.h"
+#include "PaintInfo.h"
#include "RenderTableCol.h"
#include "RenderView.h"
#include "TransformState.h"
diff --git a/Source/WebCore/rendering/RenderTableRow.cpp b/Source/WebCore/rendering/RenderTableRow.cpp
index 5bb3ff4..595e156 100644
--- a/Source/WebCore/rendering/RenderTableRow.cpp
+++ b/Source/WebCore/rendering/RenderTableRow.cpp
@@ -28,6 +28,7 @@
#include "CachedImage.h"
#include "Document.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
#include "RenderTableCell.h"
#include "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderTableSection.cpp b/Source/WebCore/rendering/RenderTableSection.cpp
index e657606..a0b6b9e 100644
--- a/Source/WebCore/rendering/RenderTableSection.cpp
+++ b/Source/WebCore/rendering/RenderTableSection.cpp
@@ -29,6 +29,7 @@
#include "Document.h"
#include "HitTestResult.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
#include "RenderTableCell.h"
#include "RenderTableCol.h"
#include "RenderTableRow.h"
diff --git a/Source/WebCore/rendering/RenderTheme.cpp b/Source/WebCore/rendering/RenderTheme.cpp
index 6a21514..b0b7735 100644
--- a/Source/WebCore/rendering/RenderTheme.cpp
+++ b/Source/WebCore/rendering/RenderTheme.cpp
@@ -33,6 +33,7 @@
#include "HTMLNames.h"
#include "MediaControlElements.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderStyle.h"
#include "RenderView.h"
#include "SelectionController.h"
diff --git a/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp b/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
index de83ae9..90736c7 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
+++ b/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
@@ -27,6 +27,7 @@
#include "CSSValueKeywords.h"
#include "Color.h"
+#include "PaintInfo.h"
#include "PlatformThemeChromiumGtk.h"
#include "RenderObject.h"
#include "ScrollbarTheme.h"
diff --git a/Source/WebCore/rendering/RenderThemeChromiumMac.mm b/Source/WebCore/rendering/RenderThemeChromiumMac.mm
index e8ffe6c..02eb134 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumMac.mm
+++ b/Source/WebCore/rendering/RenderThemeChromiumMac.mm
@@ -21,6 +21,7 @@
#import "config.h"
#import "RenderThemeChromiumMac.h"
#import "ChromiumBridge.h"
+#import "PaintInfo.h"
#import "RenderMediaControlsChromium.h"
#import "UserAgentStyleSheets.h"
#import <Carbon/Carbon.h>
diff --git a/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp b/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
index 9824851..bb60c1f 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
+++ b/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
@@ -32,6 +32,7 @@
#include "HTMLNames.h"
#include "Image.h"
#include "MediaControlElements.h"
+#include "PaintInfo.h"
#include "PlatformContextSkia.h"
#include "RenderBox.h"
#include "RenderMediaControlsChromium.h"
diff --git a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
index be670ff..5b41ea2 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -38,6 +38,7 @@
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "MediaControlElements.h"
+#include "PaintInfo.h"
#include "RenderBox.h"
#include "RenderProgress.h"
#include "RenderSlider.h"
diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
index a13b4aa..0764093 100644
--- a/Source/WebCore/rendering/RenderThemeMac.mm
+++ b/Source/WebCore/rendering/RenderThemeMac.mm
@@ -35,6 +35,7 @@
#import "ImageBuffer.h"
#import "LocalCurrentGraphicsContext.h"
#import "MediaControlElements.h"
+#import "PaintInfo.h"
#import "RenderMedia.h"
#import "RenderSlider.h"
#import "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderThemeSafari.cpp b/Source/WebCore/rendering/RenderThemeSafari.cpp
index 6d5d322..3c1dedc 100644
--- a/Source/WebCore/rendering/RenderThemeSafari.cpp
+++ b/Source/WebCore/rendering/RenderThemeSafari.cpp
@@ -35,6 +35,7 @@
#include "HTMLInputElement.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
+#include "PaintInfo.h"
#include "RenderMediaControls.h"
#include "RenderSlider.h"
#include "RenderView.h"
diff --git a/Source/WebCore/rendering/RenderThemeWinCE.cpp b/Source/WebCore/rendering/RenderThemeWinCE.cpp
index 27b8783..2c55f31 100644
--- a/Source/WebCore/rendering/RenderThemeWinCE.cpp
+++ b/Source/WebCore/rendering/RenderThemeWinCE.cpp
@@ -28,10 +28,11 @@
#include "CSSValueKeywords.h"
#include "Document.h"
#include "GraphicsContext.h"
-#include "NotImplemented.h"
#if ENABLE(VIDEO)
#include "HTMLMediaElement.h"
#endif
+#include "NotImplemented.h"
+#include "PaintInfo.h"
#include <windows.h>
diff --git a/Source/WebCore/rendering/RenderVideo.cpp b/Source/WebCore/rendering/RenderVideo.cpp
index 5b82deb..0f3b551 100644
--- a/Source/WebCore/rendering/RenderVideo.cpp
+++ b/Source/WebCore/rendering/RenderVideo.cpp
@@ -34,6 +34,7 @@
#include "HTMLNames.h"
#include "HTMLVideoElement.h"
#include "MediaPlayer.h"
+#include "PaintInfo.h"
#include "RenderView.h"
#if USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/rendering/RootInlineBox.cpp b/Source/WebCore/rendering/RootInlineBox.cpp
index 710224e..65130e7 100644
--- a/Source/WebCore/rendering/RootInlineBox.cpp
+++ b/Source/WebCore/rendering/RootInlineBox.cpp
@@ -29,6 +29,7 @@
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "Page.h"
+#include "PaintInfo.h"
#include "RenderArena.h"
#include "RenderBlock.h"
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
index a3e66bd..7117618 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
+++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
@@ -32,6 +32,7 @@
#include "GraphicsContext.h"
#include "MathMLNames.h"
+#include "PaintInfo.h"
#include "RenderText.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp b/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
index f0a7abb..075f6ba 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
+++ b/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
@@ -32,6 +32,7 @@
#include "GraphicsContext.h"
#include "MathMLNames.h"
+#include "PaintInfo.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp b/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp
index 1285acd..3f99e6d 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp
+++ b/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp
@@ -32,6 +32,7 @@
#include "GraphicsContext.h"
#include "MathMLNames.h"
+#include "PaintInfo.h"
#include "Path.h"
namespace WebCore {
diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 881818c..b780f94 100644
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -22,6 +22,8 @@
#include "config.h"
#include "RenderStyle.h"
+#include "ContentData.h"
+#include "CursorList.h"
#include "CSSPropertyNames.h"
#include "CSSStyleSelector.h"
#include "FontSelector.h"
diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
index cbc5c17..1d7aada 100644
--- a/Source/WebCore/rendering/style/RenderStyle.h
+++ b/Source/WebCore/rendering/style/RenderStyle.h
@@ -25,36 +25,24 @@
#ifndef RenderStyle_h
#define RenderStyle_h
-#include "TransformationMatrix.h"
#include "AnimationList.h"
-#include "BorderData.h"
#include "BorderValue.h"
-#include "CSSImageGeneratorValue.h"
#include "CSSPrimitiveValue.h"
#include "CSSPropertyNames.h"
-#include "CSSReflectionDirection.h"
-#include "CSSValueList.h"
-#include "CollapsedBorderValue.h"
#include "Color.h"
#include "ColorSpace.h"
-#include "ContentData.h"
#include "CounterDirectives.h"
-#include "CursorList.h"
#include "DataRef.h"
#include "FillLayer.h"
-#include "FloatPoint.h"
#include "Font.h"
#include "GraphicsTypes.h"
-#include "IntRect.h"
#include "Length.h"
#include "LengthBox.h"
#include "LengthSize.h"
#include "LineClampValue.h"
#include "NinePieceImage.h"
#include "OutlineValue.h"
-#include "Pair.h"
#include "RenderStyleConstants.h"
-#include "ShadowData.h"
#include "StyleBackgroundData.h"
#include "StyleBoxData.h"
#include "StyleFlexibleBoxData.h"
@@ -69,7 +57,6 @@
#include "StyleVisualData.h"
#include "TextDirection.h"
#include "ThemeTypes.h"
-#include "TimingFunction.h"
#include "TransformOperations.h"
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
@@ -99,10 +86,17 @@ namespace WebCore {
using std::max;
+class BorderData;
class CSSStyleSelector;
-class CSSValueList;
+class CounterContent;
+class CursorList;
+class IntRect;
class Pair;
+class ShadowData;
class StyleImage;
+class TransformationMatrix;
+
+struct ContentData;
typedef Vector<RefPtr<RenderStyle>, 4> PseudoStyleCache;
diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
index 5a3f4f4..80b576a 100644
--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
@@ -22,6 +22,7 @@
#include "config.h"
#include "StyleRareInheritedData.h"
+#include "CursorList.h"
#include "RenderStyle.h"
#include "RenderStyleConstants.h"
diff --git a/WebKit2/WebProcess/WebPage/PageOverlay.cpp b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
index cc785fc..091f460 100644
--- a/WebKit2/WebProcess/WebPage/PageOverlay.cpp
+++ b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
@@ -28,6 +28,7 @@
#include "WebPage.h"
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
#include <WebCore/Page.h>
using namespace WebCore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list