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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 26db6e943c271d6cd7545a8cce03549e76d96533
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 23:03:24 2010 +0000

    Unreviewed build fix.
    
    * WebProcess/WebPage/win/WebPageWin.cpp:
    (WebKit::WebPage::canHandleRequest): Provide alternative for
    non-CFNetwork implementation.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74298 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a02f404..a997898 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-17  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build fix.
+
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::canHandleRequest): Provide alternative for
+        non-CFNetwork implementation.
+
 2010-12-17  Ada Chan  <adachan at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
index 72554f8..d41972c 100644
--- a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
+++ b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
@@ -263,8 +263,12 @@ bool WebPage::platformHasLocalDataForURL(const WebCore::KURL& url)
 
 bool WebPage::canHandleRequest(const WebCore::ResourceRequest& request)
 {
-    // FIXME: Are there other requests we need to be able to handle? WebKit1's WebView.cpp has a FIXME here as well.
+#if USE(CFNETWORK)
+     // FIXME: Are there other requests we need to be able to handle? WebKit1's WebView.cpp has a FIXME here as well.
     return CFURLProtocolCanHandleRequest(request.cfURLRequest());
+#else
+    return true;
+#endif
 }
 
 void WebPage::confirmComposition(const String& compositionString)

-- 
WebKit Debian packaging