<!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>[160969] 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/160969">160969</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-21 16:57:06 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Rename WebURL to API::URL
https://bugs.webkit.org/show_bug.cgi?id=126100
Reviewed by Anders Carlsson.
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toURLRef):
(WebKit::toCopiedURLAPI):
* Shared/API/c/WKURL.cpp:
(WKURLGetTypeID):
(WKURLCreateWithUTF8CString):
(WKURLCreateWithBaseURL):
* Shared/API/c/cf/WKURLCF.mm:
(WKURLCreateWithCFURL):
* Shared/APIURL.h: Copied from Source/WebKit2/Shared/WebURL.h.
(API::URL::create):
(API::URL::string):
(API::URL::host):
(API::URL::protocol):
(API::URL::path):
(API::URL::lastPathComponent):
(API::URL::encode):
(API::URL::decode):
(API::URL::URL):
* Shared/Cocoa/WKNSURL.h:
(WebKit::wrapper):
* Shared/Cocoa/WKNSURL.mm:
(-[WKNSURL _web_createTarget]):
* Shared/Plugins/Netscape/PluginInformation.cpp:
(WebKit::createPluginInformationDictionary):
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebArchiveResource.h:
* Shared/WebURL.h: Removed.
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::getResourceData):
* UIProcess/WebFrameProxy.h:
* UIProcess/WebIconDatabase.cpp:
(WebKit::WebIconDatabase::didChangeIconForPageURL):
(WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):
* UIProcess/WebIconDatabaseClient.cpp:
(WebKit::WebIconDatabaseClient::didChangeIconForPageURL):
(WebKit::WebIconDatabaseClient::iconDataReadyForPageURL):
* UIProcess/WebIconDatabaseClient.h:
* UIProcess/WebOpenPanelResultListenerProxy.cpp:
(WebKit::WebOpenPanelResultListenerProxy::chooseFiles):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::getResourceDataFromFrame):
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKURLcpp">trunk/Source/WebKit2/Shared/API/c/WKURL.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccfWKURLCFmm">trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLh">trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourceh">trunk/Source/WebKit2/Shared/WebArchiveResource.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabasecpp">trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabaseClientcpp">trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabaseClienth">trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOpenPanelResultListenerProxycpp">trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp</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>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIURLh">trunk/Source/WebKit2/Shared/APIURL.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebURLh">trunk/Source/WebKit2/Shared/WebURL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2013-12-20 Sam Weinig <sam@webkit.org>
+
+ [WK2] Rename WebURL to API::URL
+ https://bugs.webkit.org/show_bug.cgi?id=126100
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toURLRef):
+ (WebKit::toCopiedURLAPI):
+ * Shared/API/c/WKURL.cpp:
+ (WKURLGetTypeID):
+ (WKURLCreateWithUTF8CString):
+ (WKURLCreateWithBaseURL):
+ * Shared/API/c/cf/WKURLCF.mm:
+ (WKURLCreateWithCFURL):
+ * Shared/APIURL.h: Copied from Source/WebKit2/Shared/WebURL.h.
+ (API::URL::create):
+ (API::URL::string):
+ (API::URL::host):
+ (API::URL::protocol):
+ (API::URL::path):
+ (API::URL::lastPathComponent):
+ (API::URL::encode):
+ (API::URL::decode):
+ (API::URL::URL):
+ * Shared/Cocoa/WKNSURL.h:
+ (WebKit::wrapper):
+ * Shared/Cocoa/WKNSURL.mm:
+ (-[WKNSURL _web_createTarget]):
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ (WebKit::createPluginInformationDictionary):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebArchiveResource.h:
+ * Shared/WebURL.h: Removed.
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::getResourceData):
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::didChangeIconForPageURL):
+ (WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):
+ * UIProcess/WebIconDatabaseClient.cpp:
+ (WebKit::WebIconDatabaseClient::didChangeIconForPageURL):
+ (WebKit::WebIconDatabaseClient::iconDataReadyForPageURL):
+ * UIProcess/WebIconDatabaseClient.h:
+ * UIProcess/WebOpenPanelResultListenerProxy.cpp:
+ (WebKit::WebOpenPanelResultListenerProxy::chooseFiles):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getResourceDataFromFrame):
+ * UIProcess/WebPageProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+
</ins><span class="cx"> 2013-12-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test /webkit2/WebKitWebResource/mime-type fails when run after /webkit2/WebKitWebView/resources
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><ins>+#include "APIURL.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "APIURLResponse.h"
</span><span class="cx"> #include "ImageOptions.h"
</span><span class="lines">@@ -47,7 +48,6 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><del>-#include "WebURL.h"
</del><span class="cx"> #include <WebCore/ContextMenuItem.h>
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKStringRef, API::String)
</span><span class="cx"> WK_ADD_API_MAPPING(WKTypeRef, API::Object)
</span><span class="cx"> WK_ADD_API_MAPPING(WKUInt64Ref, API::UInt64)
</span><del>-WK_ADD_API_MAPPING(WKURLRef, WebURL)
</del><ins>+WK_ADD_API_MAPPING(WKURLRef, API::URL)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse)
</span><span class="cx"> WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
</span><span class="lines">@@ -169,19 +169,19 @@
</span><span class="cx"> return toAPI(apiString.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ProxyingRefPtr<WebURL> toURLRef(StringImpl* string)
</del><ins>+inline ProxyingRefPtr<API::URL> toURLRef(StringImpl* string)
</ins><span class="cx"> {
</span><span class="cx"> if (!string)
</span><del>- return ProxyingRefPtr<WebURL>(0);
- return ProxyingRefPtr<WebURL>(WebURL::create(String(string)));
</del><ins>+ return ProxyingRefPtr<API::URL>(0);
+ return ProxyingRefPtr<API::URL>(API::URL::create(String(string)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline WKURLRef toCopiedURLAPI(const String& string)
</span><span class="cx"> {
</span><span class="cx"> if (!string)
</span><span class="cx"> return 0;
</span><del>- RefPtr<WebURL> webURL = WebURL::create(string);
- return toAPI(webURL.release().leakRef());
</del><ins>+ RefPtr<API::URL> url = API::URL::create(string);
+ return toAPI(url.release().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline String toWTFString(WKStringRef stringRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKURL.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKURL.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/API/c/WKURL.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -32,17 +32,17 @@
</span><span class="cx">
</span><span class="cx"> WKTypeID WKURLGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebURL::APIType);
</del><ins>+ return toAPI(API::URL::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLCreateWithUTF8CString(const char* string)
</span><span class="cx"> {
</span><del>- return toAPI(WebURL::create(String::fromUTF8(string)).leakRef());
</del><ins>+ return toAPI(API::URL::create(String::fromUTF8(string)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLCreateWithBaseURL(WKURLRef baseURL, const char* relative)
</span><span class="cx"> {
</span><del>- return toAPI(WebURL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
</del><ins>+ return toAPI(API::URL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKURLCopyString(WKURLRef url)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccfWKURLCFmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> // Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
</span><span class="cx"> if (object_getClass((NSURL *)cfURL) == wkNSURLClass()) {
</span><del>- return toAPI(static_cast<WebURL*>(&[(WKNSURL *)cfURL retain]._apiObject));
</del><ins>+ return toAPI(static_cast<API::URL*>(&[(WKNSURL *)cfURL retain]._apiObject));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLhfromrev160938trunkSourceWebKit2SharedWebURLh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIURL.h (from rev 160938, trunk/Source/WebKit2/Shared/WebURL.h) (0 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURL.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIURL.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -0,0 +1,125 @@
</span><ins>+/*
+ * Copyright (C) 2010 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 WebURL_h
+#define WebURL_h
+
+#include "APIObject.h"
+#include "WebCoreArgumentCoders.h"
+#include <WebCore/URL.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace API {
+
+class URL : public ObjectImpl<Object::Type::URL> {
+public:
+ static PassRefPtr<URL> create(const WTF::String& string)
+ {
+ return adoptRef(new URL(string));
+ }
+
+ static PassRefPtr<URL> create(const URL* baseURL, const WTF::String& relativeURL)
+ {
+ ASSERT(baseURL);
+ baseURL->parseURLIfNecessary();
+ auto absoluteURL = std::make_unique<WebCore::URL>(*baseURL->m_parsedURL.get(), relativeURL);
+ const WTF::String& absoluteURLString = absoluteURL->string();
+
+ return adoptRef(new URL(std::move(absoluteURL), absoluteURLString));
+ }
+
+ bool isNull() const { return m_string.isNull(); }
+ bool isEmpty() const { return m_string.isEmpty(); }
+
+ const WTF::String& string() const { return m_string; }
+
+ WTF::String host() const
+ {
+ parseURLIfNecessary();
+ return m_parsedURL->isValid() ? m_parsedURL->host() : WTF::String();
+ }
+
+ WTF::String protocol() const
+ {
+ parseURLIfNecessary();
+ return m_parsedURL->isValid() ? m_parsedURL->protocol() : WTF::String();
+ }
+
+ WTF::String path() const
+ {
+ parseURLIfNecessary();
+ return m_parsedURL->isValid() ? m_parsedURL->path() : WTF::String();
+ }
+
+ WTF::String lastPathComponent() const
+ {
+ parseURLIfNecessary();
+ return m_parsedURL->isValid() ? m_parsedURL->lastPathComponent() : WTF::String();
+ }
+
+ void encode(IPC::ArgumentEncoder& encoder) const
+ {
+ encoder << m_string;
+ }
+
+ static bool decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+ {
+ WTF::String string;
+ if (!decoder.decode(string))
+ return false;
+
+ result = create(string);
+ return true;
+ }
+
+private:
+ URL(const WTF::String& string)
+ : m_string(string)
+ {
+ }
+
+ URL(std::unique_ptr<WebCore::URL> parsedURL, const WTF::String& string)
+ : m_string(string)
+ , m_parsedURL(std::move(parsedURL))
+ {
+ }
+
+ void parseURLIfNecessary() const
+ {
+ if (m_parsedURL)
+ return;
+ m_parsedURL = std::make_unique<WebCore::URL>(WebCore::URL(), m_string);
+ }
+
+ WTF::String m_string;
+ mutable std::unique_ptr<WebCore::URL> m_parsedURL;
+};
+
+} // namespace WebKit
+
+#endif // URL_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -27,13 +27,19 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIURL.h"
</ins><span class="cx"> #import "WKObject.h"
</span><del>-#import "WebURL.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-inline NSURL *wrapper(WebURL& url) { ASSERT([url.wrapper() isKindOfClass:[NSURL class]]); return (NSURL *)url.wrapper(); }
</del><ins>+
+inline NSURL *wrapper(API::URL& url)
+{
+ ASSERT([url.wrapper() isKindOfClass:[NSURL class]]);
+ return (NSURL *)url.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> @interface WKNSURL : WKObject <NSCopying>
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -28,17 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIURL.h"
</ins><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WKURLCF.h"
</span><del>-#import "WebURL.h"
</del><span class="cx">
</span><del>-using namespace WebKit;
-
</del><span class="cx"> @implementation WKNSURL
</span><span class="cx">
</span><span class="cx"> - (NSObject *)_web_createTarget
</span><span class="cx"> {
</span><del>- return (NSURL *)CFMakeCollectable(WKURLCopyCFURL(kCFAllocatorDefault, toAPI(reinterpret_cast<WebURL*>(&self._apiObject))));
</del><ins>+ return (NSURL *)CFMakeCollectable(WKURLCopyCFURL(kCFAllocatorDefault, WebKit::toAPI(reinterpret_cast<API::URL*>(&self._apiObject))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSCopying protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -30,10 +30,10 @@
</span><span class="cx">
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><ins>+#include "APIURL.h"
</ins><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "PluginModuleInfo.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebURL.h"
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -136,15 +136,15 @@
</span><span class="cx"> getPluginModuleInformation(plugin, map);
</span><span class="cx">
</span><span class="cx"> if (!frameURLString.isEmpty())
</span><del>- map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
</del><ins>+ map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString));
</ins><span class="cx"> if (!mimeType.isEmpty())
</span><span class="cx"> map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
</span><span class="cx"> if (!pageURLString.isEmpty())
</span><del>- map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
</del><ins>+ map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString));
</ins><span class="cx"> if (!pluginspageAttributeURLString.isEmpty())
</span><del>- map.set(pluginInformationPluginspageAttributeURLKey(), WebURL::create(pluginspageAttributeURLString));
</del><ins>+ map.set(pluginInformationPluginspageAttributeURLKey(), API::URL::create(pluginspageAttributeURLString));
</ins><span class="cx"> if (!pluginURLString.isEmpty())
</span><del>- map.set(pluginInformationPluginURLKey(), WebURL::create(pluginURLString));
</del><ins>+ map.set(pluginInformationPluginURLKey(), API::URL::create(pluginURLString));
</ins><span class="cx"> map.set(plugInInformationReplacementObscuredKey(), API::Boolean::create(replacementObscured));
</span><span class="cx">
</span><span class="cx"> return ImmutableDictionary::create(std::move(map));
</span><span class="lines">@@ -155,11 +155,11 @@
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx">
</span><span class="cx"> if (!frameURLString.isEmpty())
</span><del>- map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
</del><ins>+ map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString));
</ins><span class="cx"> if (!mimeType.isEmpty())
</span><span class="cx"> map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
</span><span class="cx"> if (!pageURLString.isEmpty())
</span><del>- map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
</del><ins>+ map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString));
</ins><span class="cx">
</span><span class="cx"> return ImmutableDictionary::create(std::move(map));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -32,12 +32,13 @@
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><ins>+#include "APIURL.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><ins>+#include "APIURLResponse.h"
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "MutableDictionary.h"
</span><span class="cx"> #include "WebSerializedScriptValue.h"
</span><del>-#include "WebURL.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -165,8 +166,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case API::Object::Type::URL: {
</span><del>- auto& url = static_cast<const WebURL&>(object);
- encoder << url.string();
</del><ins>+ static_cast<const API::URL&>(object).encode(encoder);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,6 +174,10 @@
</span><span class="cx"> static_cast<const API::URLRequest&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::URLResponse:
+ static_cast<const API::URLResponse&>(object).encode(encoder);
+ break;
+
</ins><span class="cx"> case API::Object::Type::UInt64:
</span><span class="cx"> static_cast<const API::UInt64&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="lines">@@ -293,19 +297,21 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case API::Object::Type::URL: {
- String string;
- if (!decoder.decode(string))
</del><ins>+ case API::Object::Type::URL:
+ if (!API::URL::decode(decoder, result))
</ins><span class="cx"> return false;
</span><del>- result = WebURL::create(string);
</del><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> case API::Object::Type::URLRequest:
</span><span class="cx"> if (!API::URLRequest::decode(decoder, result))
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::URLResponse:
+ if (!API::URLResponse::decode(decoder, result))
+ return false;
+ break;
+
</ins><span class="cx"> case API::Object::Type::UInt64:
</span><span class="cx"> if (!API::UInt64::decode(decoder, result))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><ins>+#include "APIURL.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "APIURLResponse.h"
</span><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="lines">@@ -45,7 +46,6 @@
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><span class="cx"> #include "WebSerializedScriptValue.h"
</span><del>-#include "WebURL.h"
</del><span class="cx"> #include "WebUserContentURLPattern.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> // - WebRenderLayer -> WebRenderLayer
</span><span class="cx"> // - WebRenderObject -> WebRenderObject
</span><span class="cx"> // - API::UInt64 -> API::UInt64
</span><del>-// - WebURL -> WebURL
</del><ins>+// - API::URL -> API::URL
</ins><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><span class="cx"> // - API::URLResponse -> API::URLResponse
</span><span class="cx"> // - WebError -> WebError
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::URL: {
</span><del>- WebURL* urlObject = static_cast<WebURL*>(m_root);
</del><ins>+ API::URL* urlObject = static_cast<API::URL*>(m_root);
</ins><span class="cx"> encoder << urlObject->string();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> // - API::Double -> API::Double
</span><span class="cx"> // - WebImage -> WebImage
</span><span class="cx"> // - API::UInt64 -> API::UInt64
</span><del>-// - WebURL -> WebURL
</del><ins>+// - API::URL -> API::URL
</ins><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><span class="cx"> // - API::URLResponse -> API::URLResponse
</span><span class="cx"> // - WebError -> WebError
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> String string;
</span><span class="cx"> if (!decoder.decode(string))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebURL::create(string);
</del><ins>+ coder.m_root = API::URL::create(string);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::URLRequest: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Data;
</span><ins>+class URL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,8 +44,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class WebURL;
-
</del><span class="cx"> class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebArchiveResource();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebURLh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebURL.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebURL.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/Shared/WebURL.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -1,113 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 WebURL_h
-#define WebURL_h
-
-#include "APIObject.h"
-#include <WebCore/URL.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-// WebURL - A URL type suitable for vending to an API.
-
-class WebURL : public API::ObjectImpl<API::Object::Type::URL> {
-public:
- static PassRefPtr<WebURL> create(const String& string)
- {
- return adoptRef(new WebURL(string));
- }
-
- static PassRefPtr<WebURL> create(const WebURL* baseURL, const String& relativeURL)
- {
- using WebCore::URL;
-
- ASSERT(baseURL);
- baseURL->parseURLIfNecessary();
- auto absoluteURL = std::make_unique<URL>(*baseURL->m_parsedURL.get(), relativeURL);
- const String& absoluteURLString = absoluteURL->string();
-
- return adoptRef(new WebURL(std::move(absoluteURL), absoluteURLString));
- }
-
- bool isNull() const { return m_string.isNull(); }
- bool isEmpty() const { return m_string.isEmpty(); }
-
- const String& string() const { return m_string; }
-
- String host() const
- {
- parseURLIfNecessary();
- return m_parsedURL->isValid() ? m_parsedURL->host() : String();
- }
-
- String protocol() const
- {
- parseURLIfNecessary();
- return m_parsedURL->isValid() ? m_parsedURL->protocol() : String();
- }
-
- String path() const
- {
- parseURLIfNecessary();
- return m_parsedURL->isValid() ? m_parsedURL->path() : String();
- }
-
- String lastPathComponent() const
- {
- parseURLIfNecessary();
- return m_parsedURL->isValid() ? m_parsedURL->lastPathComponent() : String();
- }
-
-private:
- WebURL(const String& string)
- : m_string(string)
- {
- }
-
- WebURL(std::unique_ptr<WebCore::URL> parsedURL, const String& string)
- : m_string(string)
- , m_parsedURL(std::move(parsedURL))
- {
- }
-
- void parseURLIfNecessary() const
- {
- if (m_parsedURL)
- return;
- m_parsedURL = std::make_unique<WebCore::URL>(WebCore::URL(), m_string);
- }
-
- String m_string;
- mutable std::unique_ptr<WebCore::URL> m_parsedURL;
-};
-
-} // namespace WebKit
-
-#endif // WebURL_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> m_page->getMainResourceDataOfFrame(this, callback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getResourceData(WebURL* resourceURL, PassRefPtr<DataCallback> callback)
</del><ins>+void WebFrameProxy::getResourceData(API::URL* resourceURL, PassRefPtr<DataCallback> callback)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><span class="cx"> callback->invalidate();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> void getWebArchive(PassRefPtr<DataCallback>);
</span><span class="cx"> void getMainResourceData(PassRefPtr<DataCallback>);
</span><del>- void getResourceData(WebURL*, PassRefPtr<DataCallback>);
</del><ins>+ void getResourceData(API::URL*, PassRefPtr<DataCallback>);
</ins><span class="cx">
</span><span class="cx"> void didStartProvisionalLoad(const String& url);
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoad(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::didChangeIconForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_iconDatabaseClient.didChangeIconForPageURL(this, WebURL::create(pageURL).get());
</del><ins>+ m_iconDatabaseClient.didChangeIconForPageURL(this, API::URL::create(pageURL).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::didRemoveAllIcons()
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_iconDatabaseClient.iconDataReadyForPageURL(this, WebURL::create(pageURL).get());
</del><ins>+ m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).get());
</ins><span class="cx"> didChangeIconForPageURL(pageURL);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabaseClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, WebURL* url)
</del><ins>+void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, API::URL* url)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didChangeIconForPageURL)
</span><span class="cx"> return;
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> m_client.didRemoveAllIcons(toAPI(iconDatabase), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, WebURL* url)
</del><ins>+void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, API::URL* url)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.iconDataReadyForPageURL)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabaseClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "WKIconDatabase.h"
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><ins>+class URL;
</ins><span class="cx"> template<> struct ClientTraits<WKIconDatabaseClientBase> {
</span><span class="cx"> typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions;
</span><span class="cx"> };
</span><span class="lines">@@ -38,13 +39,12 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebIconDatabase;
</span><del>-class WebURL;
</del><span class="cx">
</span><span class="cx"> class WebIconDatabaseClient : public API::Client<WKIconDatabaseClientBase> {
</span><span class="cx"> public:
</span><del>- void didChangeIconForPageURL(WebIconDatabase*, WebURL*);
</del><ins>+ void didChangeIconForPageURL(WebIconDatabase*, API::URL*);
</ins><span class="cx"> void didRemoveAllIcons(WebIconDatabase*);
</span><del>- void iconDataReadyForPageURL(WebIconDatabase*, WebURL*);
</del><ins>+ void iconDataReadyForPageURL(WebIconDatabase*, API::URL*);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOpenPanelResultListenerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> filePaths.reserveInitialCapacity(size);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><del>- WebURL* webURL = fileURLsArray->at<WebURL>(i);
- if (webURL) {
- URL url(URL(), webURL->string());
</del><ins>+ API::URL* apiURL = fileURLsArray->at<API::URL>(i);
+ if (apiURL) {
+ URL url(URL(), apiURL->string());
</ins><span class="cx"> filePaths.uncheckedAppend(url.fileSystemPath());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -1983,7 +1983,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetMainResourceDataOfFrame(frame->frameID(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, WebURL* resourceURL, PassRefPtr<DataCallback> prpCallback)
</del><ins>+void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, PassRefPtr<DataCallback> prpCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<DataCallback> callback = prpCallback;
</span><span class="cx"> if (!isValid()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx"> void getContentsAsMHTMLData(PassRefPtr<DataCallback>, bool useBinaryEncoding);
</span><span class="cx"> #endif
</span><span class="cx"> void getMainResourceDataOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
</span><del>- void getResourceDataFromFrame(WebFrameProxy*, WebURL*, PassRefPtr<DataCallback>);
</del><ins>+ void getResourceDataFromFrame(WebFrameProxy*, API::URL*, PassRefPtr<DataCallback>);
</ins><span class="cx"> void getRenderTreeExternalRepresentation(PassRefPtr<StringCallback>);
</span><span class="cx"> void getSelectionOrContentsAsString(PassRefPtr<StringCallback>);
</span><span class="cx"> void getSelectionAsWebArchiveData(PassRefPtr<DataCallback>);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -1173,7 +1173,7 @@
</span><span class="cx"> BCD59800112B57BE00EC8C23 /* WebPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597FE112B57BE00EC8C23 /* WebPreferences.cpp */; };
</span><span class="cx"> BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
</span><span class="cx"> BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
</span><del>- BCDB86C11200FB97007254BE /* WebURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* WebURL.h */; };
</del><ins>+ BCDB86C11200FB97007254BE /* APIURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* APIURL.h */; };
</ins><span class="cx"> BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
</span><span class="lines">@@ -1967,8 +1967,8 @@
</span><span class="cx"> 2D819B99186275B3001F03D1 /* ViewGestureGeometryCollector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureGeometryCollector.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollector.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ViewGestureGeometryCollector.messages.in; sourceTree = "<group>"; };
</span><del>- 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewGestureGeometryCollectorMessageReceiver.cpp; path = ViewGestureGeometryCollectorMessageReceiver.cpp; sourceTree = "<group>"; };
- 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewGestureGeometryCollectorMessages.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
</del><ins>+ 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureGeometryCollectorMessageReceiver.cpp; sourceTree = "<group>"; };
+ 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2D870D0D1622B7F9000A3F20 /* PDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPlugin.h; path = PDF/PDFPlugin.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayerRemoteCustom.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2818,7 +2818,7 @@
</span><span class="cx"> BCD597FE112B57BE00EC8C23 /* WebPreferences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPreferences.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesStore.h; sourceTree = "<group>"; };
</span><span class="cx"> BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPreferencesStore.cpp; sourceTree = "<group>"; };
</span><del>- BCDB86C01200FB97007254BE /* WebURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURL.h; sourceTree = "<group>"; };
</del><ins>+ BCDB86C01200FB97007254BE /* APIURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURL.h; sourceTree = "<group>"; };
</ins><span class="cx"> BCDDB316124EBD130048D13C /* WKBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBase.h; sourceTree = "<group>"; };
</span><span class="cx"> BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSharedAPICast.h; sourceTree = "<group>"; };
</span><span class="cx"> BCDDB32C124EC2E10048D13C /* WKAPICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAPICast.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3511,6 +3511,7 @@
</span><span class="cx"> 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
</span><span class="cx"> 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
</span><span class="cx"> BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
</span><ins>+ BCDB86C01200FB97007254BE /* APIURL.h */,
</ins><span class="cx"> BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */,
</span><span class="cx"> BCE2315B122C30CA00D5C35A /* APIURLRequest.h */,
</span><span class="cx"> BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */,
</span><span class="lines">@@ -3643,7 +3644,6 @@
</span><span class="cx"> F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
</span><span class="cx"> A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
</span><span class="cx"> C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
</span><del>- BCDB86C01200FB97007254BE /* WebURL.h */,
</del><span class="cx"> F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
</span><span class="cx"> C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
</span><span class="cx"> );
</span><span class="lines">@@ -6183,7 +6183,7 @@
</span><span class="cx"> 1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */,
</span><span class="cx"> 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
</span><span class="cx"> 1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */,
</span><del>- BCDB86C11200FB97007254BE /* WebURL.h in Headers */,
</del><ins>+ BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
</ins><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (160968 => 160969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-21 20:25:58 UTC (rev 160968)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-22 00:57:06 UTC (rev 160969)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIString.h"
</span><ins>+#include "APIURL.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "InjectedBundleBackForwardList.h"
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="lines">@@ -46,7 +47,6 @@
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><del>-#include "WebURL.h"
</del><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="cx"> #include <WebCore/AccessibilityObject.h>
</span><span class="cx"> #include <WebCore/MainFrame.h>
</span></span></pre>
</div>
</div>
</body>
</html>