<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169696] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169696">169696</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 11:09:00 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add -[WKWebView loadHTMLString:baseURL:]
https://bugs.webkit.org/show_bug.cgi?id=133645
<rdar://problem/17170649>
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView loadHTMLString:baseURL:]):
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::createLoadDataNavigation):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadHTMLString):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadDataImpl):
(WebKit::WebPage::loadString):
(WebKit::WebPage::loadData):
(WebKit::WebPage::loadHTMLString):
(WebKit::WebPage::loadAlternateHTMLString):
(WebKit::WebPage::loadPlainTextString):
(WebKit::WebPage::loadWebArchiveData):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-06-09 Anders Carlsson <andersca@apple.com>
+
+ Add -[WKWebView loadHTMLString:baseURL:]
+ https://bugs.webkit.org/show_bug.cgi?id=133645
+ <rdar://problem/17170649>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView loadHTMLString:baseURL:]):
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::createLoadDataNavigation):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadHTMLString):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadDataImpl):
+ (WebKit::WebPage::loadString):
+ (WebKit::WebPage::loadData):
+ (WebKit::WebPage::loadHTMLString):
+ (WebKit::WebPage::loadAlternateHTMLString):
+ (WebKit::WebPage::loadPlainTextString):
+ (WebKit::WebPage::loadWebArchiveData):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2014-06-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix more latched scrolling test flakiness and slowness
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -89,6 +89,13 @@
</span><span class="cx"> */
</span><span class="cx"> - (WKNavigation *)loadRequest:(NSURLRequest *)request;
</span><span class="cx">
</span><ins>+/*! @abstract Set the page contents and base URL.
+ @param string The string to use as the main page for the document.
+ @param baseURL A file that is used to resolve relative URLs within the document.
+ @result A new navigation.
+ */
+- (WKNavigation *)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL;
+
</ins><span class="cx"> /*! @abstract Navigates to an item from the back-forward list and sets it
</span><span class="cx"> as the current item.
</span><span class="cx"> @param item The item to which to navigate. Must be one of the items in the
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -357,6 +357,14 @@
</span><span class="cx"> return [navigation.leakRef() autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKNavigation *)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL
+{
+ uint64_t navigationID = _page->loadHTMLString(string, baseURL.absoluteString);
+ auto navigation = _navigationState->createLoadDataNavigation(navigationID);
+
+ return [navigation.leakRef() autorelease];
+}
+
</ins><span class="cx"> - (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item
</span><span class="cx"> {
</span><span class="cx"> uint64_t navigationID = _page->goToBackForwardItem(&item._item);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> RetainPtr<WKNavigation> createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&);
</span><span class="cx"> RetainPtr<WKNavigation> createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);
</span><span class="cx"> RetainPtr<WKNavigation> createReloadNavigation(uint64_t navigationID);
</span><ins>+ RetainPtr<WKNavigation> createLoadDataNavigation(uint64_t navigationID);
</ins><span class="cx">
</span><span class="cx"> // Called by the history client.
</span><span class="cx"> void didNavigateWithNavigationData(const WebKit::WebNavigationDataStore&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -188,6 +188,18 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RetainPtr<WKNavigation> NavigationState::createLoadDataNavigation(uint64_t navigationID)
+{
+ ASSERT(!m_navigations.contains(navigationID));
+
+ auto navigation = adoptNS([[WKNavigation alloc] init]);
+
+ // FIXME: We need to remove the navigation when we're done with it!
+ m_navigations.set(navigationID, navigation);
+
+ return navigation;
+}
+
</ins><span class="cx"> void NavigationState::didNavigateWithNavigationData(const WebKit::WebNavigationDataStore& navigationDataStore)
</span><span class="cx"> {
</span><span class="cx"> if (!m_historyDelegateMethods.webViewDidNavigateWithNavigationData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -749,14 +749,23 @@
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData)
</del><ins>+uint64_t WebPageProxy::loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData)
</ins><span class="cx"> {
</span><ins>+ uint64_t navigationID = generateNavigationID();
+
+ auto transaction = m_pageLoadState.transaction();
+
+ String pendingAPIRequestURL = baseURL.isEmpty() ? baseURL : ASCIILiteral("about:blank");
+ m_pageLoadState.setPendingAPIRequestURL(transaction, pendingAPIRequestURL);
+
</ins><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><del>- m_process->send(Messages::WebPage::LoadHTMLString(htmlString, baseURL, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadHTMLString(navigationID, htmlString, baseURL, WebContextUserMessageEncoder(userData, process())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, API::Object* userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> uint64_t loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr);
</span><span class="cx"> void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
</span><span class="cx"> void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
</span><del>- void loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
</del><ins>+ uint64_t loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
</ins><span class="cx"> void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, API::Object* userData = nullptr);
</span><span class="cx"> void loadPlainTextString(const String&, API::Object* userData = nullptr);
</span><span class="cx"> void loadWebArchiveData(API::Data*, API::Object* userData = nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -983,7 +983,7 @@
</span><span class="cx"> ASSERT(!m_pendingNavigationID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadDataImpl(PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadDataImpl(uint64_t navigationID, PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> SendStopResponsivenessTimer stopper(this);
</span><span class="cx">
</span><span class="lines">@@ -992,6 +992,8 @@
</span><span class="cx"> if (!decoder.decode(userMessageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_pendingNavigationID = navigationID;
+
</ins><span class="cx"> ResourceRequest request(baseURL);
</span><span class="cx"> SubstituteData substituteData(sharedBuffer, MIMEType, encodingName, unreachableURL);
</span><span class="cx">
</span><span class="lines">@@ -1003,14 +1005,14 @@
</span><span class="cx"> m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadString(uint64_t navigationID, const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> if (!htmlString.isNull() && htmlString.is8Bit()) {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
</span><del>- loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, decoder);
</del><ins>+ loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, decoder);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
</span><del>- loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
</del><ins>+ loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1018,31 +1020,31 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><del>- loadDataImpl(sharedBuffer, MIMEType, encodingName, baseURL, URL(), decoder);
</del><ins>+ loadDataImpl(0, sharedBuffer, MIMEType, encodingName, baseURL, URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURLString, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><del>- loadString(htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
</del><ins>+ loadString(navigationID, htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><span class="cx"> URL unreachableURL = unreachableURLString.isEmpty() ? URL() : URL(URL(), unreachableURLString);
</span><del>- loadString(htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
</del><ins>+ loadString(0, htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadPlainTextString(const String& string, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- loadString(string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
</del><ins>+ loadString(0, string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::loadWebArchiveData(const IPC::DataReference& webArchiveData, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(webArchiveData.data()), webArchiveData.size() * sizeof(uint8_t));
</span><del>- loadDataImpl(sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
</del><ins>+ loadDataImpl(0, sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::stopLoadingFrame(uint64_t frameID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -863,8 +863,8 @@
</span><span class="cx">
</span><span class="cx"> String sourceForFrame(WebFrame*);
</span><span class="cx">
</span><del>- void loadDataImpl(PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
- void loadString(const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
</del><ins>+ void loadDataImpl(uint64_t navigationID, PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
+ void loadString(uint64_t navigationID, const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
</ins><span class="cx">
</span><span class="cx"> bool platformHasLocalDataForURL(const WebCore::URL&);
</span><span class="cx">
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> void tryClose();
</span><span class="cx"> void loadRequest(uint64_t navigationID, const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
</span><span class="cx"> void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
</span><del>- void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
</del><ins>+ void loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
</ins><span class="cx"> void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, IPC::MessageDecoder&);
</span><span class="cx"> void loadPlainTextString(const String&, IPC::MessageDecoder&);
</span><span class="cx"> void loadWebArchiveData(const IPC::DataReference&, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (169695 => 169696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-06-09 18:07:37 UTC (rev 169695)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-06-09 18:09:00 UTC (rev 169696)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> LoadURLInFrame(String url, uint64_t frameID)
</span><span class="cx"> LoadRequest(uint64_t navigationID, WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><span class="cx"> LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><del>- LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</del><ins>+ LoadHTMLString(uint64_t navigationID, String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</ins><span class="cx"> LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><span class="cx"> LoadPlainTextString(String string, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><span class="cx"> LoadWebArchiveData(IPC::DataReference webArchiveData, WebKit::WebContextUserMessageEncoder userData) Variadic
</span></span></pre>
</div>
</div>
</body>
</html>