[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 ed4289cec6b2b92c87d9ea3e78f855472fbaedfb
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 00:50:05 2010 +0000

    WebCore: Build fix, no review.
    
    Provide stubs to allow WebKit.dll to build
    for the WinCairo port.
    
    * platform/network/curl/ResourceRequest.h:
    (WebCore::ResourceRequest::ResourceRequest):
    * platform/network/curl/ResourceResponse.h:
    (WebCore::ResourceResponse::cfURLResponse):
    
    WebKit2: Build correction, no review.
    
    * win/WebKit2.vcproj: Disable two unused files for
    the WinCairo target.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d2f7d6..7e86511 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-07  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build fix, no review.
+
+        Provide stubs to allow WebKit.dll to build
+        for the WinCairo port.
+
+        * platform/network/curl/ResourceRequest.h:
+        (WebCore::ResourceRequest::ResourceRequest):
+        * platform/network/curl/ResourceResponse.h:
+        (WebCore::ResourceResponse::cfURLResponse):
+
 2010-09-07  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/network/curl/ResourceRequest.h b/WebCore/platform/network/curl/ResourceRequest.h
index 40e1e8f..12dc214 100644
--- a/WebCore/platform/network/curl/ResourceRequest.h
+++ b/WebCore/platform/network/curl/ResourceRequest.h
@@ -56,6 +56,11 @@ namespace WebCore {
         {
         }
 
+        ResourceRequest(CFURLRequestRef)
+            : ResourceRequestBase()
+        {
+        }
+
         // Needed for compatibility.
         CFURLRequestRef cfURLRequest() const { return 0; }
 
diff --git a/WebCore/platform/network/curl/ResourceResponse.h b/WebCore/platform/network/curl/ResourceResponse.h
index 6195f61..860e902 100644
--- a/WebCore/platform/network/curl/ResourceResponse.h
+++ b/WebCore/platform/network/curl/ResourceResponse.h
@@ -28,6 +28,8 @@
 
 #include "ResourceResponseBase.h"
 
+typedef const struct _CFURLResponse* CFURLResponseRef;
+
 namespace WebCore {
 
 class ResourceResponse : public ResourceResponseBase {
@@ -46,6 +48,9 @@ public:
     void setResponseFired(bool fired) { m_responseFired = fired; }
     bool responseFired() { return m_responseFired; }
 
+    // Needed for compatibility.
+    CFURLResponseRef cfURLResponse() const { return 0; }
+
 private:
     bool m_responseFired;
 };
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d5fcd31..0b0b08f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-07  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build correction, no review.
+
+        * win/WebKit2.vcproj: Disable two unused files for
+        the WinCairo target.
+
 2010-09-07  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index c745901..655b7ab 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -1488,6 +1488,22 @@
 						<File
 							RelativePath="..\UIProcess\API\C\cf\WKURLRequestCF.cpp"
 							>
+							<FileConfiguration
+								Name="Debug_Cairo|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release_Cairo|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
 						</File>
 						<File
 							RelativePath="..\UIProcess\API\C\cf\WKURLRequestCF.h"
@@ -1496,6 +1512,22 @@
 						<File
 							RelativePath="..\UIProcess\API\C\cf\WKURLResponseCF.cpp"
 							>
+							<FileConfiguration
+								Name="Debug_Cairo|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release_Cairo|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
 						</File>
 						<File
 							RelativePath="..\UIProcess\API\C\cf\WKURLResponseCF.h"

-- 
WebKit Debian packaging