[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5355861bd243b7b4d070068eecac2ad24c561d95
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 29 20:41:46 2010 +0000

    Try to fix Windows build.
    
    * rendering/style/ContentData.h: Added include of CounterContent.h.
    
    * css/CSSStyleSelector.cpp: Removed include of CounterContent.h.
    * rendering/style/ContentData.cpp: Ditto.
    * rendering/style/RenderStyle.cpp: Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66335 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c37596a..8cfbacc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-29  Darin Adler  <darin at apple.com>
 
+        Try to fix Windows build.
+
+        * rendering/style/ContentData.h: Added include of CounterContent.h.
+
+        * css/CSSStyleSelector.cpp: Removed include of CounterContent.h.
+        * rendering/style/ContentData.cpp: Ditto.
+        * rendering/style/RenderStyle.cpp: Ditto.
+
+2010-08-29  Darin Adler  <darin at apple.com>
+
         Reviewed by Sam Weinig.
 
         Deploy OwnPtr, PassOwnPtr, and adoptPtr in some CSS-related files
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 96f50cc..0ddf4f7 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -49,7 +49,6 @@
 #include "CSSVariablesRule.h"
 #include "CachedImage.h"
 #include "Counter.h"
-#include "CounterContent.h"
 #include "FocusController.h"
 #include "FontFamilyValue.h"
 #include "FontValue.h"
diff --git a/WebCore/rendering/style/ContentData.cpp b/WebCore/rendering/style/ContentData.cpp
index 25b889b..d150f77 100644
--- a/WebCore/rendering/style/ContentData.cpp
+++ b/WebCore/rendering/style/ContentData.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "ContentData.h"
 
-#include "CounterContent.h"
 #include "StyleImage.h"
 #include <wtf/text/StringImpl.h>
 
diff --git a/WebCore/rendering/style/ContentData.h b/WebCore/rendering/style/ContentData.h
index 14cef9f..4f964a2 100644
--- a/WebCore/rendering/style/ContentData.h
+++ b/WebCore/rendering/style/ContentData.h
@@ -25,16 +25,12 @@
 #ifndef ContentData_h
 #define ContentData_h
 
-#include "RenderStyleConstants.h"
-#include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
+#include "CounterContent.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
-class CounterContent;
 class StyleImage;
 
 struct ContentData : Noncopyable {
diff --git a/WebCore/rendering/style/RenderStyle.cpp b/WebCore/rendering/style/RenderStyle.cpp
index b75c4b7..1a26d49 100644
--- a/WebCore/rendering/style/RenderStyle.cpp
+++ b/WebCore/rendering/style/RenderStyle.cpp
@@ -25,7 +25,6 @@
 #include "CSSPropertyNames.h"
 #include "CSSStyleSelector.h"
 #include "CachedImage.h"
-#include "CounterContent.h"
 #include "FontSelector.h"
 #include "RenderArena.h"
 #include "RenderObject.h"

-- 
WebKit Debian packaging