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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 8a44513b177d41f75d8a3548197c0e3bdd314de2
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 21:07:26 2010 +0000

    [Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2
    https://bugs.webkit.org/show_bug.cgi?id=48764
    
    WebKit/qt:
    
    Reviewed by Andreas Kling.
    
    Add the missing error.
    
    * WebCoreSupport/FrameLoaderClientQt.cpp:
    (WebCore::FrameLoaderClientQt::pluginWillHandleLoadError):
    
    WebKit2:
    
    Reviewed by NOBODY (OOPS!).
    
    Add the missing error to Qt support.
    
    * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
    (WebKit::pluginWillHandleLoadError):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index ca9942c..1cb3356 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=48764
+
+        Add the missing error.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::pluginWillHandleLoadError):
+
 2010-11-11  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index c24a87f..5c6364e 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -896,6 +896,7 @@ enum {
     WebKitErrorCannotFindPlugIn =                               200,
     WebKitErrorCannotLoadPlugIn =                               201,
     WebKitErrorJavaUnavailable =                                202,
+    WebKitErrorPluginWillHandleLoad =                           203
 };
 
 WebCore::ResourceError FrameLoaderClientQt::blockedError(const WebCore::ResourceRequest& request)
@@ -929,10 +930,10 @@ WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore:
             QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8));
 }
 
-WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse&)
+WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& response)
 {
-    notImplemented();
-    return ResourceError();
+    return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(),
+                         QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
 }
 
 bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&)
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7482243..bcbf556 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=48764
+
+        Add the missing error to Qt support.
+
+        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
+        (WebKit::pluginWillHandleLoadError):
+
 2010-11-12  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp b/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
index c1d340e..cee6842 100644
--- a/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
@@ -26,7 +26,6 @@
 
 #include "WebErrors.h"
 
-#include "NotImplemented.h"
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 
@@ -46,6 +45,7 @@ enum {
     WebKitErrorCannotFindPlugIn =                               200,
     WebKitErrorCannotLoadPlugIn =                               201,
     WebKitErrorJavaUnavailable =                                202,
+    WebKitErrorPluginWillHandleLoad =                           203
 };
 
 ResourceError cancelledError(const ResourceRequest& request)
@@ -86,10 +86,10 @@ ResourceError fileDoesNotExistError(const ResourceResponse& response)
                          QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8));
 }
 
-ResourceError pluginWillHandleLoadError(const ResourceResponse&)
+ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
 {
-    notImplemented();
-    return ResourceError();
+    return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(),
+                         QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging