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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 460e1db75be5bd1d367b3da1110bef3ec6a005ce
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 20:20:59 2010 +0000

    Unreviewed WinCairo build fixes.
    
    * platform/network/curl/ResourceResponse.h: Correct forward declaration
    for CFURLResponseRef.
    * rendering/RenderMediaControls.h: Add ENABLE(VIDEO) guard to new
    header file to avoid build failure on non-VIDEO builds.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 341fa9a..a1f0825 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-11  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed WinCairo build fixes.
+
+        * platform/network/curl/ResourceResponse.h: Correct forward declaration
+        for CFURLResponseRef.
+        * rendering/RenderMediaControls.h: Add ENABLE(VIDEO) guard to new
+        header file to avoid build failure on non-VIDEO builds.
+
 2010-10-11  Jian Li  <jianli at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/network/curl/ResourceResponse.h b/WebCore/platform/network/curl/ResourceResponse.h
index 586fd11..49dd56c 100644
--- a/WebCore/platform/network/curl/ResourceResponse.h
+++ b/WebCore/platform/network/curl/ResourceResponse.h
@@ -28,7 +28,7 @@
 
 #include "ResourceResponseBase.h"
 
-typedef const struct _CFURLResponse* CFURLResponseRef;
+typedef struct _CFURLResponse* CFURLResponseRef;
 
 namespace WebCore {
 
diff --git a/WebCore/rendering/RenderMediaControls.h b/WebCore/rendering/RenderMediaControls.h
index f05c549..9edeef1 100644
--- a/WebCore/rendering/RenderMediaControls.h
+++ b/WebCore/rendering/RenderMediaControls.h
@@ -26,6 +26,8 @@
 #ifndef RenderMediaControls_h
 #define RenderMediaControls_h
 
+#if ENABLE(VIDEO)
+
 #include "RenderObject.h"
 #include "MediaControlElements.h"
 
@@ -41,4 +43,6 @@ public:
 
 } // namespace WebCore
 
+#endif // ENABLE(VIDEO)
+
 #endif // RenderMediaControls_h

-- 
WebKit Debian packaging