Title: [152230] trunk/Source/WebKit2
- Revision
- 152230
- Author
- [email protected]
- Date
- 2013-07-01 10:45:29 -0700 (Mon, 01 Jul 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (152229 => 152230)
--- trunk/Source/WebKit2/ChangeLog 2013-07-01 16:47:45 UTC (rev 152229)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-01 17:45:29 UTC (rev 152230)
@@ -1,3 +1,15 @@
+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 Kangil Han <[email protected]>
Adopt toHTMLTextAreaElement for code cleanup
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (152229 => 152230)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-01 16:47:45 UTC (rev 152229)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-01 17:45:29 UTC (rev 152230)
@@ -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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
