[BlackBerry] Extra ResourceRequest parameter in FrameLoaderClientBlackBerry::convertM...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2013 17:11:36 +0000 (17:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2013 17:11:36 +0000 (17:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110451

Patch by Carlos Garcia Campos <cargarcia@rim.com> on 2013-02-21
Reviewed by Rob Buis.

Remove the extra ResourceRequest parameter from
FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload.

* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload):
* WebCoreSupport/FrameLoaderClientBlackBerry.h:
(FrameLoaderClientBlackBerry):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp
Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h

index c779c2f632b3b362022980a980a17e4180950ebd..76e28df4cd7f719dddec3724929d655335f60340 100644 (file)
@@ -1,3 +1,18 @@
+2013-02-21  Carlos Garcia Campos  <cargarcia@rim.com>
+
+        [BlackBerry] Extra ResourceRequest parameter in FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload
+        https://bugs.webkit.org/show_bug.cgi?id=110451
+
+        Reviewed by Rob Buis.
+
+        Remove the extra ResourceRequest parameter from
+        FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload.
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.h:
+        (FrameLoaderClientBlackBerry):
+
 2013-02-21  Xan Lopez  <xlopez@rim.com>
 
         [BlackBerry] Adapt to name changes in WebCore::ViewPortArguments
index f49089fdcc9a76c32ccb75de27347e6d9e0723d1..538654384f98bc2c96452b24ef5c1597fef169ab 100644 (file)
@@ -1224,7 +1224,7 @@ void FrameLoaderClientBlackBerry::startDownload(const ResourceRequest& request,
     m_webPagePrivate->load(request.url().string(), BlackBerry::Platform::String::emptyString(), "GET", NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, false, false, true, "", suggestedName);
 }
 
-void FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload(MainResourceLoader* mainResourceLoader, const ResourceRequest&, const ResourceRequest&, const ResourceResponse& r)
+void FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload(MainResourceLoader* mainResourceLoader, const ResourceRequest&, const ResourceResponse& r)
 {
     BlackBerry::Platform::FilterStream* stream = NetworkManager::instance()->streamForHandle(mainResourceLoader->loader()->handle());
     ASSERT(stream);
index ed8f118cbe7c4038a767bbddff8e0209106e740a..faab79bd85669ef4f288cd9e1393e91049fa38f2 100644 (file)
@@ -144,7 +144,7 @@ public:
     virtual void didSaveToPageCache();
     virtual void didRestoreFromPageCache();
     virtual void dispatchDidBecomeFrameset(bool) { }
-    virtual void convertMainResourceLoadToDownload(MainResourceLoader*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&);
+    virtual void convertMainResourceLoadToDownload(MainResourceLoader*, const ResourceRequest&, const ResourceResponse&);
     virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int);
     virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool);
     virtual void redirectDataToPlugin(Widget*);