[webkit-changes] [149180] trunk

Fri, 26 Apr 2013 06:14:32 -0700

Title: [149180] trunk
Revision
149180
Author
[email protected]
Date
2013-04-26 06:16:15 -0700 (Fri, 26 Apr 2013)

Log Message

[BlackBerry] Clean up load interface in WebPage
https://bugs.webkit.org/show_bug.cgi?id=113267

Reviewed by Rob Buis.

Source/WebKit/blackberry:

Remove unused loadExtended(), combine load() and download() api in WebPage.
RIM Bug# 315535, internally reviewed by Joe Mason.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::load):
* Api/WebPage.h:

Tools:

Update DumpRenderTree with change of load() interface in WebPage.
RIM Bug# 315535, internally reviewed by Joe Mason.

* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(BlackBerry::WebKit::DumpRenderTree::runTest):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149179 => 149180)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-04-26 13:09:33 UTC (rev 149179)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-04-26 13:16:15 UTC (rev 149180)
@@ -725,16 +725,6 @@
     m_mainFrame->loader()->load(FrameLoadRequest(m_mainFrame, request));
 }
 
-void WebPage::load(const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& networkToken, bool isInitial, bool needReferer, bool forceDownload)
-{
-    d->load(url, networkToken, "GET", Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, isInitial, false, needReferer, forceDownload);
-}
-
-void WebPage::loadExtended(const char* url, const char* networkToken, const char* method, Platform::NetworkRequest::CachePolicy cachePolicy, const char* data, size_t dataLength, const char* const* headers, size_t headersLength, bool mustHandleInternally)
-{
-    d->load(url, networkToken, method, cachePolicy, data, dataLength, headers, headersLength, false, mustHandleInternally, false, false, "");
-}
-
 void WebPage::loadFile(const BlackBerry::Platform::String& path, const BlackBerry::Platform::String& overrideContentType)
 {
     BlackBerry::Platform::String fileUrl(path);
@@ -746,7 +736,7 @@
     d->load(fileUrl, BlackBerry::Platform::String::emptyString(), BlackBerry::Platform::String("GET", 3), Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, false, false, false, false, overrideContentType.c_str());
 }
 
-void WebPage::download(const Platform::NetworkRequest& request)
+void WebPage::load(const Platform::NetworkRequest& request, bool needReferer, bool forceDownload)
 {
     vector<const char*> headers;
     Platform::NetworkRequest::HeaderList& list = request.getHeaderListRef();
@@ -754,7 +744,7 @@
         headers.push_back(list[i].first.c_str());
         headers.push_back(list[i].second.c_str());
     }
-    d->load(request.getUrlRef(), BlackBerry::Platform::String::emptyString(), "GET", Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, headers.empty() ? 0 : &headers[0], headers.size(), false, false, false, true, "", request.getSuggestedSaveName().c_str());
+    d->load(request.getUrlRef(), BlackBerry::Platform::String::emptyString(), "GET", Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, headers.empty() ? 0 : &headers[0], headers.size(), false, false, needReferer, forceDownload, BlackBerry::Platform::String::emptyString(), request.getSuggestedSaveName());
 }
 
 void WebPagePrivate::loadString(const BlackBerry::Platform::String& string, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& contentType, const BlackBerry::Platform::String& failingURL)

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (149179 => 149180)


--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-04-26 13:09:33 UTC (rev 149179)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-04-26 13:16:15 UTC (rev 149180)
@@ -88,15 +88,11 @@
 
     WebPageClient* client() const;
 
-    void load(const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& networkToken, bool isInitial = false, bool needReferer = false, bool forceDownload = false);
-
-    void loadExtended(const char* url, const char* networkToken, const char* method, Platform::NetworkRequest::CachePolicy = Platform::NetworkRequest::UseProtocolCachePolicy, const char* data = "" size_t dataLength = 0, const char* const* headers = 0, size_t headersLength = 0, bool mustHandleInternally = false);
-
     void loadFile(const BlackBerry::Platform::String& path, const BlackBerry::Platform::String& overrideContentType = "");
 
     void loadString(const BlackBerry::Platform::String&, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& contentType = "text/html", const BlackBerry::Platform::String& failingURL = BlackBerry::Platform::String::emptyString());
 
-    void download(const Platform::NetworkRequest&);
+    void load(const Platform::NetworkRequest&, bool needReferer = false, bool forceDownload = false);
 
     bool executeJavaScript(const BlackBerry::Platform::String& script, _javascript_DataType& returnType, BlackBerry::Platform::String& returnValue);

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149179 => 149180)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-04-26 13:09:33 UTC (rev 149179)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-04-26 13:16:15 UTC (rev 149180)
@@ -1,3 +1,17 @@
+2013-04-26  Mary Wu  <[email protected]>
+
+        [BlackBerry] Clean up load interface in WebPage
+        https://bugs.webkit.org/show_bug.cgi?id=113267
+
+        Reviewed by Rob Buis.
+
+        Remove unused loadExtended(), combine load() and download() api in WebPage.
+        RIM Bug# 315535, internally reviewed by Joe Mason.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::load):
+        * Api/WebPage.h:
+
 2013-04-25  Andrew Lo  <[email protected]>
 
         [BlackBerry] Selection overlay on non-composited iframes are incorrectly positioned.

Modified: trunk/Tools/ChangeLog (149179 => 149180)


--- trunk/Tools/ChangeLog	2013-04-26 13:09:33 UTC (rev 149179)
+++ trunk/Tools/ChangeLog	2013-04-26 13:16:15 UTC (rev 149180)
@@ -1,3 +1,16 @@
+2013-04-26  Mary Wu  <[email protected]>
+
+        [BlackBerry] Clean up load interface in WebPage
+        https://bugs.webkit.org/show_bug.cgi?id=113267
+
+        Reviewed by Rob Buis.
+
+        Update DumpRenderTree with change of load() interface in WebPage.
+        RIM Bug# 315535, internally reviewed by Joe Mason.
+
+        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+        (BlackBerry::WebKit::DumpRenderTree::runTest):
+
 2013-04-26  Zan Dobersek  <[email protected]>
 
         Remove the HeapGraphSerializer unit test

Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (149179 => 149180)


--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp	2013-04-26 13:09:33 UTC (rev 149179)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp	2013-04-26 13:16:15 UTC (rev 149180)
@@ -222,7 +222,10 @@
         fwrite(m_currentTest->utf8().data(), 1, m_currentTest->utf8().length(), current);
         fclose(current);
     }
-    m_page->load(url, BlackBerry::Platform::String::emptyString(), false);
+    BlackBerry::Platform::NetworkRequest request;
+    STATIC_LOCAL_STRING(s_get, "GET");
+    request.setRequestUrl(url, s_get);
+    m_page->load(request);
 }
 
 void DumpRenderTree::doneDrt()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to