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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 57f0be104678bf3d9cf22ebf285d62789fe54a8e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 15:24:06 2010 +0000

    2010-09-16  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Add missing FrameNetworkingContextWinCE::blockedError
            https://bugs.webkit.org/show_bug.cgi?id=45680
    
            * WebCoreSupport/FrameNetworkingContextWinCE.cpp:
            (WebKit::FrameNetworkingContextWinCE::blockedError):
            * WebCoreSupport/FrameNetworkingContextWinCE.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index 44ffb44..ce377b4 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-16  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Add missing FrameNetworkingContextWinCE::blockedError
+        https://bugs.webkit.org/show_bug.cgi?id=45680
+
+        * WebCoreSupport/FrameNetworkingContextWinCE.cpp:
+        (WebKit::FrameNetworkingContextWinCE::blockedError):
+        * WebCoreSupport/FrameNetworkingContextWinCE.h:
+
 2010-09-13  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp b/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp
index af9efc2..477fe97 100644
--- a/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp
+++ b/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.cpp
@@ -25,6 +25,9 @@
 #include "config.h"
 #include "FrameNetworkingContextWinCE.h"
 
+#include "NotImplemented.h"
+#include "ResourceError.h"
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -45,4 +48,10 @@ String FrameNetworkingContextWinCE::referrer() const
     return frame()->loader()->referrer();
 }
 
+WebCore::ResourceError FrameNetworkingContextWinCE::blockedError(const WebCore::ResourceRequest&) const
+{
+    notImplemented();
+    return WebCore::ResourceError();
+}
+
 } // namespace WebKit
diff --git a/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h b/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h
index a826a37..436aff7 100644
--- a/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h
+++ b/WebKit/wince/WebCoreSupport/FrameNetworkingContextWinCE.h
@@ -38,6 +38,7 @@ public:
 
     virtual WTF::String userAgent() const;
     virtual WTF::String referrer() const;
+    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
 
 private:
     FrameNetworkingContextWinCE(WebCore::Frame* frame, const WTF::String& userAgent);

-- 
WebKit Debian packaging