Changeset 152230 in webkit

Timestamp:

Jul 1, 2013 10:45:29 AM (11 years ago)

Author:

weinig@apple.com

Message:

WKPageLoadDataWithUserData neglects to set the base URL that is passed in
<rdar://problem/14306784>
​https://bugs.webkit.org/show_bug.cgi?id=118256

Reviewed by Anders Carlsson.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::loadData):
Pass the baseURL, not blankURL(), and remove an unnecessary multiplication by sizeof(uint8_t) which is always 1.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-01  Sam Weinig  <sam@webkit.org>
+
+        WKPageLoadDataWithUserData neglects to set the base URL that is passed in
+        <rdar://problem/14306784>
+        https://bugs.webkit.org/show_bug.cgi?id=118256
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::loadData):
+        Pass the baseURL, not blankURL(), and remove an unnecessary multiplication by sizeof(uint8_t) which is always 1.
+
 2013-07-01  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -938 +938 @@
 void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
 {
-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size() * sizeof(uint8_t));
+    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
     KURL baseURL = baseURLString.isEmpty() ? blankURL() : KURL(KURL(), baseURLString);
-    loadDataImpl(sharedBuffer, MIMEType, encodingName, blankURL(), KURL(), decoder);
+    loadDataImpl(sharedBuffer, MIMEType, encodingName, baseURL, KURL(), decoder);
 }