<!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>[163301] releases/WebKitGTK/webkit-2.4/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/163301">163301</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-03 05:43:36 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/163037">r163037</a> - Consolidate page loading functions
https://bugs.webkit.org/show_bug.cgi?id=127847
Reviewed by Tim Horton.
Get rid of the loadURL functions (and the LoadURL message), rename
loadURLRequest to loadRequest and change it to take a ResourceRequest instead
of an API::URLRequest.
* UIProcess/API/C/WKPage.cpp:
(WKPageLoadURL):
(WKPageLoadURLWithUserData):
(WKPageLoadURLRequest):
(WKPageLoadURLRequestWithUserData):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController loadRequest:userData:]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView loadRequest:]):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_load_uri):
(webkit_web_view_load_request):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::decidePolicyForNavigationAction):
(WebKit::WebInspectorProxy::createInspectorPage):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadRequest):
(WebKit::WebPageProxy::loadFile):
* UIProcess/WebPageProxy.h:
* UIProcess/cf/WebPageProxyCF.cpp:
(WebKit::WebPageProxy::restoreFromSessionStateData):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadRequest):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICWKPagecpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICocoaWKWebViewmm">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebInspectorProxycpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxycpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxyh">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcesscfWebPageProxyCFcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPageh">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPagemessagesin">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-01-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix the GTK+ build after r163037.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_load_uri):
+ (webkit_web_view_load_request):
+
+2014-01-29 Anders Carlsson <andersca@apple.com>
+
+ Consolidate page loading functions
+ https://bugs.webkit.org/show_bug.cgi?id=127847
+
+ Reviewed by Tim Horton.
+
+ Get rid of the loadURL functions (and the LoadURL message), rename
+ loadURLRequest to loadRequest and change it to take a ResourceRequest instead
+ of an API::URLRequest.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageLoadURL):
+ (WKPageLoadURLWithUserData):
+ (WKPageLoadURLRequest):
+ (WKPageLoadURLRequestWithUserData):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController loadRequest:userData:]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView loadRequest:]):
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::decidePolicyForNavigationAction):
+ (WebKit::WebInspectorProxy::createInspectorPage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadRequest):
+ (WebKit::WebPageProxy::loadFile):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/cf/WebPageProxyCF.cpp:
+ (WebKit::WebPageProxy::restoreFromSessionStateData):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadRequest):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -82,22 +82,22 @@
</span><span class="cx">
</span><span class="cx"> void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->loadURL(toWTFString(URLRef));
</del><ins>+ toImpl(pageRef)->loadRequest(toWTFString(URLRef));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->loadURL(toWTFString(URLRef), toImpl(userDataRef));
</del><ins>+ toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), toImpl(userDataRef));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageLoadURLRequest(WKPageRef pageRef, WKURLRequestRef urlRequestRef)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef));
</del><ins>+ toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageLoadURLRequestWithUserData(WKPageRef pageRef, WKURLRequestRef urlRequestRef, WKTypeRef userDataRef)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef), toImpl(userDataRef));
</del><ins>+ toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest(), toImpl(userDataRef));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageLoadFile(WKPageRef pageRef, WKURLRef fileURL, WKURLRef resourceDirectoryURL)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -187,13 +187,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)loadRequest:(NSURLRequest *)request userData:(id)userData
</span><span class="cx"> {
</span><del>- RefPtr<API::URLRequest> wkURLRequest = API::URLRequest::create(request);
-
</del><span class="cx"> RefPtr<ObjCObjectGraph> wkUserData;
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- _page->loadURLRequest(wkURLRequest.get(), wkUserData.get());
</del><ins>+ _page->loadRequest(request, wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)loadRequest:(NSURLRequest *)request
</span><span class="cx"> {
</span><del>- _page->loadURLRequest(API::URLRequest::create(request).get());
</del><ins>+ _page->loadRequest(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark iOS-specific methods
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -1945,7 +1945,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx"> g_return_if_fail(uri);
</span><span class="cx">
</span><del>- getPage(webView)->loadURL(String::fromUTF8(uri));
</del><ins>+ getPage(webView)->loadRequest(String::fromUTF8(uri));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2027,8 +2027,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest resourceRequest;
</span><span class="cx"> webkitURIRequestGetResourceRequest(request, resourceRequest);
</span><del>- RefPtr<API::URLRequest> urlRequest = API::URLRequest::create(resourceRequest);
- getPage(webView)->loadURLRequest(urlRequest.get());
</del><ins>+ getPage(webView)->loadRequest(resourceRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> toImpl(listenerRef)->ignore();
</span><span class="cx">
</span><span class="cx"> // And instead load it in the inspected page.
</span><del>- webInspectorProxy->page()->loadURLRequest(toImpl(requestRef));
</del><ins>+ webInspectorProxy->page()->loadRequest(toImpl(requestRef)->resourceRequest());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx">
</span><span class="cx"> m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL());
</span><span class="cx">
</span><del>- inspectorPage->loadURL(url);
</del><ins>+ inspectorPage->loadRequest(URL(URL(), url));
</ins><span class="cx">
</span><span class="cx"> m_createdInspectorPage = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -607,40 +607,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadURL(const String& url, API::Object* userData)
</del><ins>+void WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><span class="cx">
</span><del>- m_pageLoadState.setPendingAPIRequestURL(transaction, url);
</del><ins>+ m_pageLoadState.setPendingAPIRequestURL(transaction, request.url());
</ins><span class="cx">
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><del>- bool createdExtension = maybeInitializeSandboxExtensionHandle(URL(URL(), url), sandboxExtensionHandle);
</del><ins>+ bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle);
</ins><span class="cx"> if (createdExtension)
</span><span class="cx"> m_process->willAcquireUniversalFileReadSandboxExtension();
</span><del>- m_process->send(Messages::WebPage::LoadURL(url, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadURLRequest(API::URLRequest* urlRequest, API::Object* userData)
-{
- auto transaction = m_pageLoadState.transaction();
-
- m_pageLoadState.setPendingAPIRequestURL(transaction, urlRequest->resourceRequest().url());
-
- if (!isValid())
- reattachToWebProcess();
-
- SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(urlRequest->resourceRequest().url(), sandboxExtensionHandle);
- if (createdExtension)
- m_process->willAcquireUniversalFileReadSandboxExtension();
- m_process->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest(), sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
- m_process->responsivenessTimer()->start();
-}
-
</del><span class="cx"> void WebPageProxy::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="lines">@@ -664,7 +647,7 @@
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><span class="cx"> SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle);
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(resourceDirectoryURL);
</span><del>- m_process->send(Messages::WebPage::LoadURL(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -380,8 +380,7 @@
</span><span class="cx"> bool tryClose();
</span><span class="cx"> bool isClosed() const { return m_isClosed; }
</span><span class="cx">
</span><del>- void loadURL(const String&, API::Object* userData = nullptr);
- void loadURLRequest(API::URLRequest*, API::Object* userData = nullptr);
</del><ins>+ void loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr);
</ins><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><span class="cx"> void loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcesscfWebPageProxyCFcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (provisionalURL)
</span><del>- loadURL(provisionalURL);
</del><ins>+ loadRequest(URL(URL(), provisionalURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RetainPtr<CFStringRef> autosaveKey(const String& name)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -891,11 +891,6 @@
</span><span class="cx"> send(Messages::WebPageProxy::ClosePage(false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadURL(const String& url, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
-{
- loadURLRequest(ResourceRequest(URL(URL(), url)), sandboxExtensionHandle, decoder);
-}
-
</del><span class="cx"> void WebPage::loadURLInFrame(const String& url, uint64_t frameID)
</span><span class="cx"> {
</span><span class="cx"> WebFrame* frame = WebProcess::shared().webFrame(frameID);
</span><span class="lines">@@ -905,7 +900,7 @@
</span><span class="cx"> frame->coreFrame()->loader().load(FrameLoadRequest(frame->coreFrame(), ResourceRequest(URL(URL(), url))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadURLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> SendStopResponsivenessTimer stopper(this);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -723,8 +723,7 @@
</span><span class="cx">
</span><span class="cx"> // Actions
</span><span class="cx"> void tryClose();
</span><del>- void loadURL(const String&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
- void loadURLRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
</del><ins>+ void loadRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
</ins><span class="cx"> void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
</span><span class="cx"> void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
</span><span class="cx"> void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (163300 => 163301)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-03 13:43:36 UTC (rev 163301)
</span><span class="lines">@@ -81,9 +81,8 @@
</span><span class="cx"> GoToBackForwardItem(uint64_t backForwardItemID)
</span><span class="cx"> TryRestoreScrollPosition()
</span><span class="cx">
</span><del>- LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
</del><span class="cx"> LoadURLInFrame(String url, uint64_t frameID)
</span><del>- LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
</del><ins>+ LoadRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
</ins><span class="cx"> LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><span class="cx"> LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</span><span class="cx"> LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
</span></span></pre>
</div>
</div>
</body>
</html>