<!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>[174029] 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/174029">174029</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-09-26 16:38:30 -0700 (Fri, 26 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API for loading local files
https://bugs.webkit.org/show_bug.cgi?id=137153
rdar://problem/17761459
Reviewed by Oliver Hunt.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView loadFileURL:allowingReadAccessToURL:]):
Load the file, wrapping the navigation ID in a WKNavigation using createLoadRequestNavigation.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadFile):
* UIProcess/WebPageProxy.h:
Return the navigation ID (or 0 if the navigation failed).</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174028 => 174029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-26 23:25:17 UTC (rev 174028)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-26 23:38:30 UTC (rev 174029)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-26 Anders Carlsson <andersca@apple.com>
+
+ Add API for loading local files
+ https://bugs.webkit.org/show_bug.cgi?id=137153
+ rdar://problem/17761459
+
+ Reviewed by Oliver Hunt.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView loadFileURL:allowingReadAccessToURL:]):
+ Load the file, wrapping the navigation ID in a WKNavigation using createLoadRequestNavigation.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadFile):
+ * UIProcess/WebPageProxy.h:
+ Return the navigation ID (or 0 if the navigation failed).
+
</ins><span class="cx"> 2014-09-26 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WKInspector back function stubs that went missing from r173929.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (174028 => 174029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-09-26 23:25:17 UTC (rev 174028)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-09-26 23:38:30 UTC (rev 174029)
</span><span class="lines">@@ -89,6 +89,15 @@
</span><span class="cx"> */
</span><span class="cx"> - (WKNavigation *)loadRequest:(NSURLRequest *)request;
</span><span class="cx">
</span><ins>+/*! @abstract Navigates to the requested file URL on the filesystem.
+ @param URL The file URL to which to navigate.
+ @param readAccessURL The URL to allow read access to.
+ @discussion If readAccessURL references a single file, only that file may be loaded by WebKit.
+ If readAccessURL references a directory, files inside that file may be loaded by WebKit.
+ @result A new navigation for the given file URL.
+ */
+- (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> /*! @abstract Sets the webpage contents and base URL.
</span><span class="cx"> @param string The string to use as the contents of the webpage.
</span><span class="cx"> @param baseURL A URL that is used to resolve relative URLs within the document.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (174028 => 174029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-09-26 23:25:17 UTC (rev 174028)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-09-26 23:38:30 UTC (rev 174029)
</span><span class="lines">@@ -406,6 +406,23 @@
</span><span class="cx"> return navigation.autorelease();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL
+{
+ if (![URL isFileURL])
+ [NSException raise:NSInvalidArgumentException format:@"%@ is not a file URL", URL];
+
+ if (![readAccessURL isFileURL])
+ [NSException raise:NSInvalidArgumentException format:@"%@ is not a file URL", readAccessURL];
+
+ uint64_t navigationID = _page->loadFile([URL _web_originalDataAsWTFString], [readAccessURL _web_originalDataAsWTFString]);
+ if (!navigationID)
+ return nil;
+
+ auto navigation = _navigationState->createLoadRequestNavigation(navigationID, [NSURLRequest requestWithURL:URL]);
+
+ return navigation.autorelease();
+}
+
</ins><span class="cx"> - (WKNavigation *)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL
</span><span class="cx"> {
</span><span class="cx"> uint64_t navigationID = _page->loadHTMLString(string, baseURL.absoluteString);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (174028 => 174029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-09-26 23:25:17 UTC (rev 174028)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-09-26 23:38:30 UTC (rev 174029)
</span><span class="lines">@@ -740,17 +740,17 @@
</span><span class="cx"> return navigationID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
</del><ins>+uint64_t WebPageProxy::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> if (m_isClosed)
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> URL fileURL = URL(URL(), fileURLString);
</span><span class="cx"> if (!fileURL.isLocalFile())
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> URL resourceDirectoryURL;
</span><span class="cx"> if (resourceDirectoryURLString.isNull())
</span><span class="lines">@@ -758,16 +758,24 @@
</span><span class="cx"> else {
</span><span class="cx"> resourceDirectoryURL = URL(URL(), resourceDirectoryURLString);
</span><span class="cx"> if (!resourceDirectoryURL.isLocalFile())
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ uint64_t navigationID = generateNavigationID();
+
+ auto transaction = m_pageLoadState.transaction();
+
+ m_pageLoadState.setPendingAPIRequestURL(transaction, fileURLString);
+
</ins><span class="cx"> String resourceDirectoryPath = resourceDirectoryURL.fileSystemPath();
</span><span class="cx">
</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::LoadRequest(generateNavigationID(), fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(navigationID, fileURL, 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::loadData(API::Data* data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (174028 => 174029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-09-26 23:25:17 UTC (rev 174028)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-09-26 23:38:30 UTC (rev 174029)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> bool isClosed() const { return m_isClosed; }
</span><span class="cx">
</span><span class="cx"> uint64_t loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr);
</span><del>- void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
</del><ins>+ uint64_t loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
</ins><span class="cx"> void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
</span><span class="cx"> uint64_t loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
</span><span class="cx"> void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, API::Object* userData = nullptr);
</span></span></pre>
</div>
</div>
</body>
</html>