<!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>[160853] 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/160853">160853</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 13:32:15 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Rename WebURLResponse to API::URLResponse
https://bugs.webkit.org/show_bug.cgi?id=125910
Reviewed by Andreas Kling.
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
* Shared/API/c/WKURLResponse.cpp:
(WKURLResponseGetTypeID):
* Shared/API/c/mac/WKURLResponseNS.mm:
(WKURLResponseCreateWithNSURLResponse):
* Shared/APIURLRequest.cpp:
* Shared/APIURLResponse.cpp: Copied from Source/WebKit2/Shared/WebURLResponse.cpp.
(API::URLResponse::URLResponse):
(API::URLResponse::encode):
(API::URLResponse::decode):
* Shared/APIURLResponse.h: Copied from Source/WebKit2/Shared/WebURLResponse.h.
(API::URLResponse::create):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebURLResponse.cpp: Removed.
* Shared/WebURLResponse.h: Removed.
* UIProcess/WebDownloadClient.cpp:
(WebKit::WebDownloadClient::didReceiveResponse):
* UIProcess/WebPolicyClient.cpp:
(WebKit::WebPolicyClient::decidePolicyForResponse):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):</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="#trunkSourceWebKit2SharedAPIcWKURLResponsecpp">trunk/Source/WebKit2/Shared/API/c/WKURLResponse.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKURLResponseNSmm">trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIURLRequestcpp">trunk/Source/WebKit2/Shared/APIURLRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDownloadClientcpp">trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPolicyClientcpp">trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIURLResponsecpp">trunk/Source/WebKit2/Shared/APIURLResponse.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIURLResponseh">trunk/Source/WebKit2/Shared/APIURLResponse.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebURLResponsecpp">trunk/Source/WebKit2/Shared/WebURLResponse.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebURLResponseh">trunk/Source/WebKit2/Shared/WebURLResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2013-12-17 Sam Weinig <sam@webkit.org>
+
+ [WK2] Rename WebURLResponse to API::URLResponse
+ https://bugs.webkit.org/show_bug.cgi?id=125910
+
+ Reviewed by Andreas Kling.
+
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI):
+ * Shared/API/c/WKURLResponse.cpp:
+ (WKURLResponseGetTypeID):
+ * Shared/API/c/mac/WKURLResponseNS.mm:
+ (WKURLResponseCreateWithNSURLResponse):
+ * Shared/APIURLRequest.cpp:
+ * Shared/APIURLResponse.cpp: Copied from Source/WebKit2/Shared/WebURLResponse.cpp.
+ (API::URLResponse::URLResponse):
+ (API::URLResponse::encode):
+ (API::URLResponse::decode):
+ * Shared/APIURLResponse.h: Copied from Source/WebKit2/Shared/WebURLResponse.h.
+ (API::URLResponse::create):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebURLResponse.cpp: Removed.
+ * Shared/WebURLResponse.h: Removed.
+ * UIProcess/WebDownloadClient.cpp:
+ (WebKit::WebDownloadClient::didReceiveResponse):
+ * UIProcess/WebPolicyClient.cpp:
+ (WebKit::WebPolicyClient::decidePolicyForResponse):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
+ (WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):
+
</ins><span class="cx"> 2013-12-19 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Regressions in WebView's contentScaleFactor/contentPosition
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><ins>+#include "APIURLResponse.h"
</ins><span class="cx"> #include "ImageOptions.h"
</span><span class="cx"> #include "SameDocumentNavigationType.h"
</span><span class="cx"> #include "WKBase.h"
</span><span class="lines">@@ -47,7 +48,6 @@
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><span class="cx"> #include "WebURL.h"
</span><del>-#include "WebURLResponse.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">@@ -80,7 +80,6 @@
</span><span class="cx"> class WebImage;
</span><span class="cx"> class WebSecurityOrigin;
</span><span class="cx"> class WebSerializedScriptValue;
</span><del>-class WebURLResponse;
</del><span class="cx"> class WebUserContentURLPattern;
</span><span class="cx">
</span><span class="cx"> template<typename APIType> struct APITypeInfo { };
</span><span class="lines">@@ -112,7 +111,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKUInt64Ref, API::UInt64)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLRef, WebURL)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest)
</span><del>-WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)
</del><ins>+WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
</span><span class="cx">
</span><span class="cx"> template<> struct APITypeInfo<WKMutableArrayRef> { typedef API::Array* ImplType; };
</span><span class="lines">@@ -209,9 +208,9 @@
</span><span class="cx"> return ProxyingRefPtr<API::URLRequest>(API::URLRequest::create(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ProxyingRefPtr<WebURLResponse> toAPI(const WebCore::ResourceResponse& response)
</del><ins>+inline ProxyingRefPtr<API::URLResponse> toAPI(const WebCore::ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- return ProxyingRefPtr<WebURLResponse>(WebURLResponse::create(response));
</del><ins>+ return ProxyingRefPtr<API::URLResponse>(API::URLResponse::create(response));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline WKSecurityOriginRef toCopiedAPI(WebCore::SecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKURLResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKURLResponse.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKURLResponse.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/API/c/WKURLResponse.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -26,15 +26,15 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKURLResponse.h"
</span><span class="cx">
</span><ins>+#include "APIURLResponse.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebURLResponse.h"
</del><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKURLResponseGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebURLResponse::APIType);
</del><ins>+ return toAPI(API::URLResponse::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLResponseCopyURL(WKURLResponseRef responseRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKURLResponseNSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -26,15 +26,15 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WKURLResponseNS.h"
</span><span class="cx">
</span><ins>+#import "APIURLResponse.h"
</ins><span class="cx"> #import "WKAPICast.h"
</span><del>-#import "WebURLResponse.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKURLResponseRef WKURLResponseCreateWithNSURLResponse(NSURLResponse* urlResponse)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSURLResponse> copiedURLResponse = adoptNS([urlResponse copy]);
</span><del>- RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse.get());
</del><ins>+ RefPtr<API::URLResponse> response = API::URLResponse::create(copiedURLResponse.get());
</ins><span class="cx"> return toAPI(response.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIURLRequest.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURLRequest.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/APIURLRequest.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -26,9 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx">
</span><del>-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
</del><span class="cx"> #include "WebContext.h"
</span><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLResponsecppfromrev160748trunkSourceWebKit2SharedWebURLResponsecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIURLResponse.cpp (from rev 160748, trunk/Source/WebKit2/Shared/WebURLResponse.cpp) (0 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURLResponse.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/APIURLResponse.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -0,0 +1,55 @@
</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.
+ */
+
+#include "config.h"
+#include "APIURLResponse.h"
+
+#include "WebCoreArgumentCoders.h"
+
+using namespace WebCore;
+
+namespace API {
+
+URLResponse::URLResponse(const WebCore::ResourceResponse& response)
+ : m_response(response)
+{
+}
+
+void URLResponse::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << resourceResponse();
+}
+
+bool URLResponse::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+{
+ ResourceResponse response;
+ if (!decoder.decode(response))
+ return false;
+
+ result = create(response);
+ return true;
+}
+
+} // namespace API
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLResponsehfromrev160748trunkSourceWebKit2SharedWebURLResponseh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIURLResponse.h (from rev 160748, trunk/Source/WebKit2/Shared/WebURLResponse.h) (0 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURLResponse.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIURLResponse.h 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -0,0 +1,60 @@
</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 APIURLResponse_h
+#define APIURLResponse_h
+
+#include "APIObject.h"
+#include <WebCore/ResourceResponse.h>
+#include <wtf/Forward.h>
+
+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
+namespace API {
+
+class URLResponse : public ObjectImpl<Object::Type::URLResponse> {
+public:
+ static PassRefPtr<URLResponse> create(const WebCore::ResourceResponse& response)
+ {
+ return adoptRef(new URLResponse(response));
+ }
+
+ const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
+
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+
+private:
+ explicit URLResponse(const WebCore::ResourceResponse&);
+
+ WebCore::ResourceResponse m_response;
+};
+
+} // namespace API
+
+#endif // APIURLResponse_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><ins>+#include "APIURLResponse.h"
</ins><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -45,7 +46,6 @@
</span><span class="cx"> #include "WebRenderObject.h"
</span><span class="cx"> #include "WebSerializedScriptValue.h"
</span><span class="cx"> #include "WebURL.h"
</span><del>-#include "WebURLResponse.h"
</del><span class="cx"> #include "WebUserContentURLPattern.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> // - API::UInt64 -> API::UInt64
</span><span class="cx"> // - WebURL -> WebURL
</span><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><del>-// - WebURLResponse -> WebURLResponse
</del><ins>+// - API::URLResponse -> API::URLResponse
</ins><span class="cx"> // - WebError -> WebError
</span><span class="cx">
</span><span class="cx"> template<typename Owner>
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::URLResponse: {
</span><del>- WebURLResponse* urlResponseObject = static_cast<WebURLResponse*>(m_root);
</del><ins>+ API::URLResponse* urlResponseObject = static_cast<API::URLResponse*>(m_root);
</ins><span class="cx"> encoder << urlResponseObject->resourceResponse();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> // - API::UInt64 -> API::UInt64
</span><span class="cx"> // - WebURL -> WebURL
</span><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><del>-// - WebURLResponse -> WebURLResponse
</del><ins>+// - API::URLResponse -> API::URLResponse
</ins><span class="cx"> // - WebError -> WebError
</span><span class="cx">
</span><span class="cx"> template<typename Owner>
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> WebCore::ResourceResponse response;
</span><span class="cx"> if (!decoder.decode(response))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebURLResponse::create(response);
</del><ins>+ coder.m_root = API::URLResponse::create(response);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::UserContentURLPattern: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebURLResponsecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebURLResponse.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebURLResponse.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/WebURLResponse.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -1,36 +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.
- */
-
-#include "config.h"
-#include "WebURLResponse.h"
-
-namespace WebKit {
-
-WebURLResponse::WebURLResponse(const WebCore::ResourceResponse& response)
- : m_response(response)
-{
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebURLResponseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebURLResponse.h (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebURLResponse.h 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/Shared/WebURLResponse.h 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -1,52 +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 WebURLResponse_h
-#define WebURLResponse_h
-
-#include "APIObject.h"
-#include <WebCore/ResourceResponse.h>
-#include <wtf/Forward.h>
-
-namespace WebKit {
-
-class WebURLResponse : public API::ObjectImpl<API::Object::Type::URLResponse> {
-public:
- static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response)
- {
- return adoptRef(new WebURLResponse(response));
- }
-
- const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
-
-private:
- explicit WebURLResponse(const WebCore::ResourceResponse&);
-
- WebCore::ResourceResponse m_response;
-};
-
-} // namespace WebKit
-
-#endif // WebURLResponse_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebDownloadClient.h"
</span><span class="cx">
</span><ins>+#include "APIURLResponse.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebURLResponse.h"
</del><span class="cx"> #include "WKRetainPtr.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (!m_client.didReceiveResponse)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(WebURLResponse::create(response).get()), m_client.base.clientInfo);
</del><ins>+ m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(API::URLResponse::create(response).get()), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDownloadClient::didReceiveData(WebContext* webContext, DownloadProxy* downloadProxy, uint64_t length)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if (!m_client.decidePolicyForResponse_deprecatedForUseWithV0 && !m_client.decidePolicyForResponse)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<WebURLResponse> response = WebURLResponse::create(resourceResponse);
</del><ins>+ RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
</ins><span class="cx"> RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</span><span class="cx">
</span><span class="cx"> if (m_client.decidePolicyForResponse_deprecatedForUseWithV0)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -1081,8 +1081,8 @@
</span><span class="cx"> BC8F2F2B16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F2F2916273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> BC8F2F2E16273ACC005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */; };
</span><span class="cx"> BC9099801256A98200083756 /* WKStringPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90997F1256A98200083756 /* WKStringPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */; };
- BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; };
</del><ins>+ BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */; };
+ BC90A1D3122DD55E00CC8C50 /* APIURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */; };
</ins><span class="cx"> BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
</span><span class="cx"> BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
</span><span class="cx"> BC989D81161A7E5D000D46D3 /* WKWebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC989D7F161A7E5B000D46D3 /* WKWebProcessPlugIn.mm */; };
</span><span class="lines">@@ -2722,8 +2722,8 @@
</span><span class="cx"> BC8F2F2916273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextController.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextControllerInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> BC90997F1256A98200083756 /* WKStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKStringPrivate.h; sourceTree = "<group>"; };
</span><del>- BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLResponse.h; sourceTree = "<group>"; };
- BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLResponse.cpp; sourceTree = "<group>"; };
</del><ins>+ BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURLResponse.h; sourceTree = "<group>"; };
+ BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIURLResponse.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC989D7F161A7E5B000D46D3 /* WKWebProcessPlugIn.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugIn.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3513,6 +3513,8 @@
</span><span class="cx"> BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
</span><span class="cx"> BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */,
</span><span class="cx"> BCE2315B122C30CA00D5C35A /* APIURLRequest.h */,
</span><ins>+ BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */,
+ BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */,
</ins><span class="cx"> A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
</span><span class="cx"> A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
</span><span class="cx"> 515E7725183DD6F60007203F /* AsyncRequest.cpp */,
</span><span class="lines">@@ -3642,8 +3644,6 @@
</span><span class="cx"> A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
</span><span class="cx"> C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
</span><span class="cx"> BCDB86C01200FB97007254BE /* WebURL.h */,
</span><del>- BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
- BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
</del><span class="cx"> F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
</span><span class="cx"> C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
</span><span class="cx"> );
</span><span class="lines">@@ -6186,7 +6186,7 @@
</span><span class="cx"> BCDB86C11200FB97007254BE /* WebURL.h in Headers */,
</span><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><del>- BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */,
</del><ins>+ BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</ins><span class="cx"> F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
</span><span class="cx"> 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */,
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
</span><span class="lines">@@ -7553,7 +7553,7 @@
</span><span class="cx"> 1A594ABA112A1FB6009DE7C7 /* WebUIClient.cpp in Sources */,
</span><span class="cx"> BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
</span><span class="cx"> BCE2315E122C30CA00D5C35A /* APIURLRequest.cpp in Sources */,
</span><del>- BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */,
</del><ins>+ BC90A1D3122DD55E00CC8C50 /* APIURLResponse.cpp in Sources */,
</ins><span class="cx"> C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
</span><span class="cx"> 51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
</span><span class="cx"> 29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp (160852 => 160853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2013-12-19 21:15:12 UTC (rev 160852)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2013-12-19 21:32:15 UTC (rev 160853)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (!m_client.decidePolicyForResponse)
</span><span class="cx"> return WKBundlePagePolicyActionPassThrough;
</span><span class="cx">
</span><del>- RefPtr<WebURLResponse> response = WebURLResponse::create(resourceResponse);
</del><ins>+ RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
</ins><span class="cx"> RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</span><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span></span></pre>
</div>
</div>
</body>
</html>