Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152263 => 152264)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 21:17:47 UTC (rev 152263)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 21:19:12 UTC (rev 152264)
@@ -1,5 +1,21 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152230
+
+ 2013-07-01 Sam Weinig <[email protected]>
+
+ 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 Lucas Forschler <[email protected]>
+
Merge r152187
2013-06-28 Gavin Barraclough <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (152263 => 152264)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-01 21:17:47 UTC (rev 152263)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-01 21:19:12 UTC (rev 152264)
@@ -937,9 +937,9 @@
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);
}
void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
