<!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>[163062] 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/163062">163062</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-29 18:49:27 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a NavigationState object to keep track of the navigations for a given page
https://bugs.webkit.org/show_bug.cgi?id=127884
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKNavigation.mm:
(-[WKNavigation request]):
(-[WKNavigation setRequest:]):
* UIProcess/API/Cocoa/WKNavigationInternal.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView loadRequest:]):
* UIProcess/Cocoa/NavigationState.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm.
* UIProcess/Cocoa/NavigationState.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm.
(WebKit::NavigationState::NavigationState):
(WebKit::NavigationState::~NavigationState):
(WebKit::NavigationState::createLoadRequestNavigation):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadRequest):
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/UIProcess/Cocoa/</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-29 Anders Carlsson <andersca@apple.com>
+
+ Add a NavigationState object to keep track of the navigations for a given page
+ https://bugs.webkit.org/show_bug.cgi?id=127884
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKNavigation.mm:
+ (-[WKNavigation request]):
+ (-[WKNavigation setRequest:]):
+ * UIProcess/API/Cocoa/WKNavigationInternal.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView loadRequest:]):
+ * UIProcess/Cocoa/NavigationState.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm.
+ * UIProcess/Cocoa/NavigationState.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm.
+ (WebKit::NavigationState::NavigationState):
+ (WebKit::NavigationState::~NavigationState):
+ (WebKit::NavigationState::createLoadRequestNavigation):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadRequest):
+ * UIProcess/WebPageProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-01-29 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Add IsVisibleOrOccluded to ViewState
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -34,19 +34,14 @@
</span><span class="cx"> RetainPtr<NSURLRequest> _request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)initWithRequest:(NSURLRequest *)request
</del><ins>+- (NSURLRequest *)request
</ins><span class="cx"> {
</span><del>- if (!(self = [super init]))
- return nil;
-
- _request = adoptNS([request copy]);
-
- return self;
</del><ins>+ return _request.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSURLRequest *)request
</del><ins>+- (void)setRequest:(NSURLRequest *)request
</ins><span class="cx"> {
</span><del>- return _request.get();
</del><ins>+ _request = adoptNS([request copy]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WKNavigation ()
</span><span class="cx">
</span><del>-- (instancetype)initWithRequest:(NSURLRequest *)request;
</del><ins>+@property (nonatomic, readwrite, copy) NSURLRequest *request;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "NavigationState.h"
</ins><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKProcessClass.h"
</span><span class="cx"> #import "WKWebViewConfiguration.h"
</span><span class="lines">@@ -55,6 +56,8 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKWebView {
</span><span class="cx"> RetainPtr<WKWebViewConfiguration> _configuration;
</span><ins>+ std::unique_ptr<WebKit::NavigationState> _navigationState;
+
</ins><span class="cx"> RefPtr<WebKit::WebPageProxy> _page;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -85,6 +88,8 @@
</span><span class="cx"> if (![_configuration processClass])
</span><span class="cx"> [_configuration setProcessClass:adoptNS([[WKProcessClass alloc] init]).get()];
</span><span class="cx">
</span><ins>+ _navigationState = std::make_unique<WebKit::NavigationState>(self);
+
</ins><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -123,9 +128,10 @@
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)loadRequest:(NSURLRequest *)request
</span><span class="cx"> {
</span><del>- _page->loadRequest(request);
</del><ins>+ uint64_t navigationID = _page->loadRequest(request);
+ auto navigation = _navigationState->createLoadRequestNavigation(navigationID, request);
</ins><span class="cx">
</span><del>- return [[[WKNavigation alloc] initWithRequest:request] autorelease];
</del><ins>+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark iOS-specific methods
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatehfromrev163061trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (from rev 163061, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm) (0 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NavigationState_h
+#define NavigationState_h
+
+#import <wtf/HashMap.h>
+#import <wtf/RetainPtr.h>
+
+OBJC_CLASS WKNavigation;
+OBJC_CLASS WKWebView;
+
+namespace WebKit {
+
+class NavigationState {
+public:
+ explicit NavigationState(WKWebView *);
+ ~NavigationState();
+
+ RetainPtr<WKNavigation> createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);
+
+private:
+ HashMap<uint64_t, RetainPtr<WKNavigation>> m_navigations;
+};
+
+} // namespace WebKit
+
+#endif // NavigationState_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemmfromrev163061trunkSourceWebKit2UIProcessAPICocoaWKNavigationmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (from rev 163061, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm) (0 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "NavigationState.h"
+
+#import "WKNavigationInternal.h"
+
+namespace WebKit {
+
+NavigationState::NavigationState(WKWebView *webView)
+{
+}
+
+NavigationState::~NavigationState()
+{
+}
+
+RetainPtr<WKNavigation> NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)
+{
+ ASSERT(!m_navigations.contains(navigationID));
+
+ RetainPtr<WKNavigation> navigation = adoptNS([[WKNavigation alloc] init]);
+ [navigation setRequest:request];
+
+ // FIXME: We need to remove the navigation when we're done with it!
+ m_navigations.set(navigationID, navigation);
+
+ return navigation;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -608,8 +608,10 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData)
</del><ins>+uint64_t WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData)
</ins><span class="cx"> {
</span><ins>+ uint64_t navigationID = generateNavigationID();
+
</ins><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, request.url());
</span><span class="lines">@@ -621,8 +623,10 @@
</span><span class="cx"> bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle);
</span><span class="cx"> if (createdExtension)
</span><span class="cx"> m_process->willAcquireUniversalFileReadSandboxExtension();
</span><del>- m_process->send(Messages::WebPage::LoadRequest(generateNavigationID(), request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(navigationID, request, sandboxExtensionHandle, 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::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -380,7 +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 loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr);
</del><ins>+ uint64_t 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="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163061 => 163062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-30 02:10:00 UTC (rev 163061)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-30 02:49:27 UTC (rev 163062)
</span><span class="lines">@@ -291,6 +291,8 @@
</span><span class="cx"> 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */; };
</span><ins>+ 1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ABC3DF31899E437004F0626 /* NavigationState.mm */; };
+ 1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DF41899E437004F0626 /* NavigationState.h */; };
</ins><span class="cx"> 1AC1336718565B5700F3EC05 /* UserData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336518565B5700F3EC05 /* UserData.cpp */; };
</span><span class="cx"> 1AC1336818565B5700F3EC05 /* UserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336618565B5700F3EC05 /* UserData.h */; };
</span><span class="cx"> 1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */; };
</span><span class="lines">@@ -1936,6 +1938,8 @@
</span><span class="cx"> 1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageFindMatchesClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageContextMenuClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationInternal.h; sourceTree = "<group>"; };
</span><ins>+ 1ABC3DF31899E437004F0626 /* NavigationState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationState.mm; sourceTree = "<group>"; };
+ 1ABC3DF41899E437004F0626 /* NavigationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationState.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AC1336518565B5700F3EC05 /* UserData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1336618565B5700F3EC05 /* UserData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserData.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPageHandle.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3950,6 +3954,15 @@
</span><span class="cx"> path = Downloads;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 1ABC3DF21899E415004F0626 /* Cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 1ABC3DF41899E437004F0626 /* NavigationState.h */,
+ 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
+ );
+ path = Cocoa;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 1AE00D6818327C1200087DD7 /* IPC */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -4877,6 +4890,7 @@
</span><span class="cx"> BC032DC410F4387C0058C15A /* API */,
</span><span class="cx"> 512F588D12A8836F00629530 /* Authentication */,
</span><span class="cx"> 51B3004D12529CF5000B5CA0 /* cf */,
</span><ins>+ 1ABC3DF21899E415004F0626 /* Cocoa */,
</ins><span class="cx"> 517DD5BB180DA7C40081660B /* Databases */,
</span><span class="cx"> 1AB7D4C71288AA9A00CFD08C /* Downloads */,
</span><span class="cx"> BC111B18112F5FB400337BAB /* Launcher */,
</span><span class="lines">@@ -6172,6 +6186,7 @@
</span><span class="cx"> 2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */,
</span><span class="cx"> 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */,
</span><span class="cx"> 1A64229A12DD029200CAAE2C /* DrawingAreaMessages.h in Headers */,
</span><ins>+ 1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,
</ins><span class="cx"> BC2652171182608100243E12 /* DrawingAreaProxy.h in Headers */,
</span><span class="cx"> 1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */,
</span><span class="cx"> 5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */,
</span><span class="lines">@@ -8063,6 +8078,7 @@
</span><span class="cx"> 1AD09F2B1743F8E600A95E50 /* WKNPAPIPlugInContainer.mm in Sources */,
</span><span class="cx"> BC407601124FF0270068F20A /* WKNumber.cpp in Sources */,
</span><span class="cx"> 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */,
</span><ins>+ 1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */,
</ins><span class="cx"> BC85806312B8505700EDEB2E /* WKOpenPanelParameters.cpp in Sources */,
</span><span class="cx"> BC85806212B8505700EDEB2E /* WKOpenPanelResultListener.cpp in Sources */,
</span><span class="cx"> 51FCB18817BBFE0300394CD8 /* SynchronousNetworkLoaderClient.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>