From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 Source/WebCore/rendering/style/RenderStyle.cpp     |  3 +++
 Source/WebCore/rendering/style/RenderStyle.h       | 22 ++++++++--------------
 .../WebCore/rendering/style/RenderStyleConstants.h |  2 +-
 .../rendering/style/StyleRareInheritedData.cpp     |  2 ++
 .../rendering/style/StyleRareNonInheritedData.cpp  |  1 +
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'Source/WebCore/rendering/style')

diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 881818c..4665e52 100644
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -22,12 +22,15 @@
 #include "config.h"
 #include "RenderStyle.h"
 
+#include "ContentData.h"
+#include "CursorList.h"
 #include "CSSPropertyNames.h"
 #include "CSSStyleSelector.h"
 #include "FontSelector.h"
 #include "RenderArena.h"
 #include "RenderObject.h"
 #include "ScaleTransformOperation.h"
+#include "ShadowData.h"
 #include "StyleImage.h"
 #include <wtf/StdLibExtras.h>
 #include <algorithm>
diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
index 7e61e46..14329bc 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/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
index 0839864..7cd4903 100644
--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
@@ -68,7 +68,7 @@ enum StyleDifferenceContextSensitiveProperty {
 enum PseudoId {
     // The order must be NOP ID, public IDs, and then internal IDs.
     NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER,
-    SLIDER_THUMB, SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL,
+    SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL,
     MEDIA_CONTROLS_PLAY_BUTTON, MEDIA_CONTROLS_MUTE_BUTTON, MEDIA_CONTROLS_TIMELINE, MEDIA_CONTROLS_TIMELINE_CONTAINER,
     MEDIA_CONTROLS_VOLUME_SLIDER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON, 
     MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY, 
diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
index 6138df2..0953dae 100644
--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
@@ -22,8 +22,10 @@
 #include "config.h"
 #include "StyleRareInheritedData.h"
 
+#include "CursorList.h"
 #include "RenderStyle.h"
 #include "RenderStyleConstants.h"
+#include "ShadowData.h"
 
 namespace WebCore {
 
diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
index 42cf966..3771f13 100644
--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
@@ -26,6 +26,7 @@
 #include "ContentData.h"
 #include "RenderCounter.h"
 #include "RenderStyle.h"
+#include "ShadowData.h"
 #include "StyleImage.h"
 
 namespace WebCore {
-- 
cgit v1.1