<!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>[160971] 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/160971">160971</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-21 18:18:51 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Rename WebError to API::Error
https://bugs.webkit.org/show_bug.cgi?id=126125
Reviewed by Anders Carlsson.
* Shared/API/c/WKError.cpp:
(WKErrorGetTypeID):
(WKErrorCopyWKErrorDomain):
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
* Shared/API/c/cf/WKErrorCF.cpp:
(WKErrorCreateWithCFError):
* Shared/APIError.cpp: Copied from Source/WebKit2/Shared/WebError.cpp.
(API::Error::webKitErrorDomain):
(API::Error::encode):
(API::Error::decode):
* Shared/APIError.h: Copied from Source/WebKit2/Shared/WebError.h.
(API::Error::create):
(API::Error::domain):
(API::Error::failingURL):
(API::Error::localizedDescription):
(API::Error::Error):
* Shared/Cocoa/WKNSError.h:
(WebKit::wrapper):
* Shared/Cocoa/WKNSError.mm:
(-[WKNSError _web_createTarget]):
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebError.cpp: Removed.
* Shared/WebError.h: Removed.
* UIProcess/AutoCorrectionCallback.h:
(WebKit::AutocorrectionDataCallback::invalidate):
* UIProcess/GenericCallback.h:
(WebKit::VoidCallback::invalidate):
(WebKit::GenericCallback::invalidate):
(WebKit::ComputedPagesCallback::invalidate):
(WebKit::ImageCallback::invalidate):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::printFinishedCallback):
* UIProcess/WebPageProxy.h:
(WebKit::ValidateCommandCallback::invalidate):
(WebKit::GestureCallback::invalidate):
(WebKit::TouchesCallback::invalidate):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
(WebKit::blockedError):
(WebKit::cannotShowURLError):
(WebKit::interruptedForPolicyChangeError):
(WebKit::cannotShowMIMETypeError):
(WebKit::pluginWillHandleLoadError):
(WebKit::internalError):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorcpp">trunk/Source/WebKit2/Shared/API/c/WKError.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccfWKErrorCFcpp">trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSErrorh">trunk/Source/WebKit2/Shared/Cocoa/WKNSError.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSErrormm">trunk/Source/WebKit2/Shared/Cocoa/WKNSError.mm</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="#trunkSourceWebKit2UIProcessAutoCorrectionCallbackh">trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.h</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="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIErrorcpp">trunk/Source/WebKit2/Shared/APIError.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIErrorh">trunk/Source/WebKit2/Shared/APIError.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebErrorcpp">trunk/Source/WebKit2/Shared/WebError.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebErrorh">trunk/Source/WebKit2/Shared/WebError.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2013-12-21 Sam Weinig <sam@webkit.org>
+
+ [WK2] Rename WebError to API::Error
+ https://bugs.webkit.org/show_bug.cgi?id=126125
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/c/WKError.cpp:
+ (WKErrorGetTypeID):
+ (WKErrorCopyWKErrorDomain):
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI):
+ * Shared/API/c/cf/WKErrorCF.cpp:
+ (WKErrorCreateWithCFError):
+ * Shared/APIError.cpp: Copied from Source/WebKit2/Shared/WebError.cpp.
+ (API::Error::webKitErrorDomain):
+ (API::Error::encode):
+ (API::Error::decode):
+ * Shared/APIError.h: Copied from Source/WebKit2/Shared/WebError.h.
+ (API::Error::create):
+ (API::Error::domain):
+ (API::Error::failingURL):
+ (API::Error::localizedDescription):
+ (API::Error::Error):
+ * Shared/Cocoa/WKNSError.h:
+ (WebKit::wrapper):
+ * Shared/Cocoa/WKNSError.mm:
+ (-[WKNSError _web_createTarget]):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebError.cpp: Removed.
+ * Shared/WebError.h: Removed.
+ * UIProcess/AutoCorrectionCallback.h:
+ (WebKit::AutocorrectionDataCallback::invalidate):
+ * UIProcess/GenericCallback.h:
+ (WebKit::VoidCallback::invalidate):
+ (WebKit::GenericCallback::invalidate):
+ (WebKit::ComputedPagesCallback::invalidate):
+ (WebKit::ImageCallback::invalidate):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::printFinishedCallback):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::ValidateCommandCallback::invalidate):
+ (WebKit::GestureCallback::invalidate):
+ (WebKit::TouchesCallback::invalidate):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+ (WebKit::blockedError):
+ (WebKit::cannotShowURLError):
+ (WebKit::interruptedForPolicyChangeError):
+ (WebKit::cannotShowMIMETypeError):
+ (WebKit::pluginWillHandleLoadError):
+ (WebKit::internalError):
+
</ins><span class="cx"> 2013-12-20 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WK2] Rename WebURL to API::URL
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKError.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKError.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/API/c/WKError.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,19 +26,19 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKError.h"
</span><span class="cx">
</span><del>-#include "WebError.h"
</del><ins>+#include "APIError.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKErrorGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebError::APIType);
</del><ins>+ return toAPI(API::Error::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKErrorCopyWKErrorDomain()
</span><span class="cx"> {
</span><del>- return toCopiedAPI(WebError::webKitErrorDomain());
</del><ins>+ return toCopiedAPI(API::Error::webKitErrorDomain());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKErrorCopyDomain(WKErrorRef errorRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef WKSharedAPICast_h
</span><span class="cx"> #define WKSharedAPICast_h
</span><span class="cx">
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURL.h"
</span><span class="lines">@@ -44,7 +45,6 @@
</span><span class="cx"> #include "WKPageVisibilityTypes.h"
</span><span class="cx"> #include "WKUserContentInjectedFrames.h"
</span><span class="cx"> #include "WKUserScriptInjectionTime.h"
</span><del>-#include "WebError.h"
</del><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKDataRef, API::Data)
</span><span class="cx"> WK_ADD_API_MAPPING(WKDictionaryRef, ImmutableDictionary)
</span><span class="cx"> WK_ADD_API_MAPPING(WKDoubleRef, API::Double)
</span><del>-WK_ADD_API_MAPPING(WKErrorRef, WebError)
</del><ins>+WK_ADD_API_MAPPING(WKErrorRef, API::Error)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKGraphicsContextRef, WebGraphicsContext)
</span><span class="cx"> WK_ADD_API_MAPPING(WKImageRef, WebImage)
</span><span class="cx"> WK_ADD_API_MAPPING(WKMutableDictionaryRef, MutableDictionary)
</span><span class="lines">@@ -198,9 +198,9 @@
</span><span class="cx"> return toImpl(urlRef)->string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ProxyingRefPtr<WebError> toAPI(const WebCore::ResourceError& error)
</del><ins>+inline ProxyingRefPtr<API::Error> toAPI(const WebCore::ResourceError& error)
</ins><span class="cx"> {
</span><del>- return ProxyingRefPtr<WebError>(WebError::create(error));
</del><ins>+ return ProxyingRefPtr<API::Error>(API::Error::create(error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ProxyingRefPtr<API::URLRequest> toAPI(const WebCore::ResourceRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccfWKErrorCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,15 +26,15 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKErrorCF.h"
</span><span class="cx">
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebError.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError)
</span><span class="cx"> {
</span><del>- RefPtr<WebError> error = WebError::create(ResourceError(cfError));
</del><ins>+ RefPtr<API::Error> error = API::Error::create(ResourceError(cfError));
</ins><span class="cx"> return toAPI(error.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIErrorcppfromrev160968trunkSourceWebKit2SharedWebErrorcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIError.cpp (from rev 160968, trunk/Source/WebKit2/Shared/WebError.cpp) (0 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIError.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/APIError.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -0,0 +1,56 @@
</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 "APIError.h"
+
+#include "WebCoreArgumentCoders.h"
+#include <wtf/NeverDestroyed.h>
+#include <wtf/text/WTFString.h>
+
+namespace API {
+
+const WTF::String& Error::webKitErrorDomain()
+{
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitErrorDomain"));
+ return webKitErrorDomainString;
+}
+
+void Error::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << platformError();
+}
+
+bool Error::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+{
+ WebCore::ResourceError error;
+ if (!decoder.decode(error))
+ return false;
+
+ result = create(error);
+ return true;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIErrorhfromrev160968trunkSourceWebKit2SharedWebErrorh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIError.h (from rev 160968, trunk/Source/WebKit2/Shared/WebError.h) (0 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIError.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIError.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -0,0 +1,79 @@
</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 APIError_h
+#define APIError_h
+
+#include "APIObject.h"
+#include <WebCore/ResourceError.h>
+#include <wtf/PassRefPtr.h>
+
+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
+namespace API {
+
+class Error : public ObjectImpl<Object::Type::Error> {
+public:
+ static PassRefPtr<Error> create()
+ {
+ return adoptRef(new Error);
+ }
+
+ static PassRefPtr<Error> create(const WebCore::ResourceError& error)
+ {
+ return adoptRef(new Error(error));
+ }
+
+ static const WTF::String& webKitErrorDomain();
+
+ const WTF::String& domain() const { return m_platformError.domain(); }
+ int errorCode() const { return m_platformError.errorCode(); }
+ const WTF::String& failingURL() const { return m_platformError.failingURL(); }
+ const WTF::String& localizedDescription() const { return m_platformError.localizedDescription(); }
+
+ const WebCore::ResourceError& platformError() const { return m_platformError; }
+
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+
+private:
+ Error()
+ {
+ }
+
+ Error(const WebCore::ResourceError& error)
+ : m_platformError(error)
+ {
+ }
+
+ WebCore::ResourceError m_platformError;
+};
+
+} // namespace API
+
+#endif // APIError_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSError.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSError.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSError.h 2013-12-22 02:18:51 UTC (rev 160971)
</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 "APIError.h"
</ins><span class="cx"> #import "WKObject.h"
</span><del>-#import "WebError.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-inline NSError *wrapper(WebError& error) { ASSERT([error.wrapper() isKindOfClass:[NSError self]]); return (NSError *)error.wrapper(); }
</del><ins>+
+inline NSError *wrapper(API::Error& error)
+{
+ ASSERT([error.wrapper() isKindOfClass:[NSError self]]);
+ return (NSError *)error.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> @interface WKNSError : WKObject <NSCopying>
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSErrormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSError.mm (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSError.mm 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSError.mm 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -28,15 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "WebError.h"
</del><ins>+#import "APIError.h"
</ins><span class="cx">
</span><del>-using namespace WebKit;
-
</del><span class="cx"> @implementation WKNSError
</span><span class="cx">
</span><span class="cx"> - (NSObject *)_web_createTarget
</span><span class="cx"> {
</span><del>- return [(NSError *)static_cast<WebError*>(&self._apiObject)->platformError().cfError() copy];
</del><ins>+ return [(NSError *)static_cast<API::Error*>(&self._apiObject)->platformError().cfError() copy];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSCopying protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIData.h"
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="lines">@@ -137,6 +138,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Error:
+ static_cast<const API::Error&>(object).encode(encoder);
+ break;
+
</ins><span class="cx"> case API::Object::Type::FrameHandle: {
</span><span class="cx"> auto& frameHandle = static_cast<const API::FrameHandle&>(object);
</span><span class="cx"> encoder << frameHandle.frameID();
</span><span class="lines">@@ -250,6 +255,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::Error:
+ if (!API::Error::decode(decoder, result))
+ return false;
+ break;
+
</ins><span class="cx"> case API::Object::Type::FrameHandle: {
</span><span class="cx"> uint64_t frameID;
</span><span class="cx"> if (!decoder.decode(frameID))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIData.h"
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="lines">@@ -41,7 +42,6 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebError.h"
</del><span class="cx"> #include "WebImage.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // - API::URL -> API::URL
</span><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><span class="cx"> // - API::URLResponse -> API::URLResponse
</span><del>-// - WebError -> WebError
</del><ins>+// - API::Error -> API::Error
</ins><span class="cx">
</span><span class="cx"> template<typename Owner>
</span><span class="cx"> class UserMessageEncoder {
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::Error: {
</span><del>- WebError* errorObject = static_cast<WebError*>(m_root);
</del><ins>+ API::Error* errorObject = static_cast<API::Error*>(m_root);
</ins><span class="cx"> encoder << errorObject->platformError();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> // - API::URL -> API::URL
</span><span class="cx"> // - API::URLRequest -> API::URLRequest
</span><span class="cx"> // - API::URLResponse -> API::URLResponse
</span><del>-// - WebError -> WebError
</del><ins>+// - API::Error -> API::Error
</ins><span class="cx">
</span><span class="cx"> template<typename Owner>
</span><span class="cx"> class UserMessageDecoder {
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx"> WebCore::ResourceError resourceError;
</span><span class="cx"> if (!decoder.decode(resourceError))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebError::create(resourceError);
</del><ins>+ coder.m_root = API::Error::create(resourceError);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebErrorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebError.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebError.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/WebError.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -1,39 +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 "WebError.h"
-
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-const String& WebError::webKitErrorDomain()
-{
- DEFINE_STATIC_LOCAL(String, webKitErrorDomainString, (ASCIILiteral("WebKitErrorDomain")));
- return webKitErrorDomainString;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebError.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebError.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/Shared/WebError.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -1,73 +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 WebError_h
-#define WebError_h
-
-#include "APIObject.h"
-#include <WebCore/ResourceError.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-// WebError - An error type suitable for vending to an API.
-
-class WebError : public API::ObjectImpl<API::Object::Type::Error> {
-public:
- static PassRefPtr<WebError> create()
- {
- return adoptRef(new WebError);
- }
-
- static PassRefPtr<WebError> create(const WebCore::ResourceError& error)
- {
- return adoptRef(new WebError(error));
- }
-
- static const String& webKitErrorDomain();
-
- const String& domain() const { return m_platformError.domain(); }
- int errorCode() const { return m_platformError.errorCode(); }
- const String& failingURL() const { return m_platformError.failingURL(); }
- const String& localizedDescription() const { return m_platformError.localizedDescription(); }
-
- const WebCore::ResourceError& platformError() const { return m_platformError; }
-
-private:
- WebError()
- {
- }
-
- WebError(const WebCore::ResourceError& error)
- : m_platformError(error)
- {
- }
-
- WebCore::ResourceError m_platformError;
-};
-
-} // namespace WebKit
-
-#endif // WebError_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutoCorrectionCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef AutoCorrectionCallback_h
</span><span class="cx"> #define AutoCorrectionCallback_h
</span><span class="cx">
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "GenericCallback.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebError.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(Vector<WebCore::FloatRect>(), String(), 0, 0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef GenericCallback_h
</span><span class="cx"> #define GenericCallback_h
</span><span class="cx">
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebError.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(Vector<WebCore::IntRect>(), 0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> m_callback(handle, toAPI(error.get()), context());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -3683,7 +3683,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create(printError);
</del><ins>+ RefPtr<API::Error> error = API::Error::create(printError);
</ins><span class="cx"> callback->performCallbackWithReturnValue(error.get());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(0, 0, 0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(WebCore::IntPoint(), 0, 0, 0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_callback);
</span><span class="cx">
</span><del>- RefPtr<WebError> error = WebError::create();
</del><ins>+ RefPtr<API::Error> error = API::Error::create();
</ins><span class="cx"> m_callback(WebCore::IntPoint(), 0, toAPI(error.get()), context());
</span><span class="cx">
</span><span class="cx"> m_callback = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> 51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */; };
</span><span class="cx"> 5167EEA0170377BF007681CA /* DiskCacheMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5167EE9E170377BF007681CA /* DiskCacheMonitor.h */; };
</span><span class="cx"> 5167EEA1170377BF007681CA /* DiskCacheMonitor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5167EE9F170377BF007681CA /* DiskCacheMonitor.mm */; };
</span><del>- 516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* WebError.h */; };
</del><ins>+ 516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* APIError.h */; };
</ins><span class="cx"> 51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */; };
</span><span class="cx"> 51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7DF16138E2900D03ED3 /* NetworkProcess.cpp */; };
</span><span class="cx"> 5179556A162876F300FA43B6 /* NetworkProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7E016138E2900D03ED3 /* NetworkProcess.h */; };
</span><span class="lines">@@ -769,6 +769,7 @@
</span><span class="cx"> 7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */; };
</span><span class="cx"> 7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */; };
</span><span class="cx"> 7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */; };
</span><ins>+ 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
</ins><span class="cx"> 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
</span><span class="cx"> 7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -996,7 +997,7 @@
</span><span class="cx"> BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC574E611267D080006F0F12 /* WebPopupMenuProxy.h */; };
</span><span class="cx"> BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */; };
</span><span class="cx"> BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
</span><del>- BC575613126E0138006F0F12 /* WebError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* WebError.cpp */; };
</del><ins>+ BC575613126E0138006F0F12 /* APIError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* APIError.cpp */; };
</ins><span class="cx"> BC59534210FC04520098F82D /* WebLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59534010FC04520098F82D /* WebLoaderClient.h */; };
</span><span class="cx"> BC59548915C7868500FD1E3E /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59548815C7868500FD1E3E /* WebKit2.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
</span><span class="lines">@@ -2217,7 +2218,7 @@
</span><span class="cx"> 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 5167EE9E170377BF007681CA /* DiskCacheMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCacheMonitor.h; sourceTree = "<group>"; };
</span><span class="cx"> 5167EE9F170377BF007681CA /* DiskCacheMonitor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DiskCacheMonitor.mm; sourceTree = "<group>"; };
</span><del>- 516A4A5B120A2CCD00C05B7F /* WebError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebError.h; sourceTree = "<group>"; };
</del><ins>+ 516A4A5B120A2CCD00C05B7F /* APIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIError.h; sourceTree = "<group>"; };
</ins><span class="cx"> 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKApplicationCacheManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKApplicationCacheManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2389,6 +2390,7 @@
</span><span class="cx"> 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player.plugin.sb"; sourceTree = "<group>"; };
</span><span class="cx"> 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.microsoft.SilverlightPlugin.sb; sourceTree = "<group>"; };
</span><span class="cx"> 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.oracle.java.JavaAppletPlugin.sb; sourceTree = "<group>"; };
</span><ins>+ 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoCorrectionCallback.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObjCTypeWrapperRef.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKObjCTypeWrapperRef.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBaseMac.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2635,7 +2637,7 @@
</span><span class="cx"> BC574E611267D080006F0F12 /* WebPopupMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenuProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenuProxyMac.h; sourceTree = "<group>"; };
</span><span class="cx"> BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
</span><del>- BC575612126E0138006F0F12 /* WebError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebError.cpp; sourceTree = "<group>"; };
</del><ins>+ BC575612126E0138006F0F12 /* APIError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIError.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> BC59534010FC04520098F82D /* WebLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLoaderClient.h; sourceTree = "<group>"; };
</span><span class="cx"> BC59548815C7868500FD1E3E /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
</span><span class="cx"> BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3501,6 +3503,8 @@
</span><span class="cx"> 1A3DD205125E5A2F004515E6 /* APIClient.h */,
</span><span class="cx"> 1AAB037B185F99D800EDF501 /* APIData.cpp */,
</span><span class="cx"> 51578B821209ECEF00A37C4A /* APIData.h */,
</span><ins>+ BC575612126E0138006F0F12 /* APIError.cpp */,
+ 516A4A5B120A2CCD00C05B7F /* APIError.h */,
</ins><span class="cx"> 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */,
</span><span class="cx"> 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */,
</span><span class="cx"> 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */,
</span><span class="lines">@@ -3602,8 +3606,6 @@
</span><span class="cx"> BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
</span><span class="cx"> 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */,
</span><span class="cx"> 516311861858446600534647 /* WebCrossThreadCopier.h */,
</span><del>- BC575612126E0138006F0F12 /* WebError.cpp */,
- 516A4A5B120A2CCD00C05B7F /* WebError.h */,
</del><span class="cx"> C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
</span><span class="cx"> BC032DAF10F4380F0058C15A /* WebEvent.h */,
</span><span class="cx"> BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
</span><span class="lines">@@ -4560,6 +4562,7 @@
</span><span class="cx"> 1A44B95816B73F8C00B7BBD8 /* Storage */,
</span><span class="cx"> BCF69FA11176D01400471A52 /* APINavigationData.cpp */,
</span><span class="cx"> BCF69FA01176D01400471A52 /* APINavigationData.h */,
</span><ins>+ 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */,
</ins><span class="cx"> BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
</span><span class="cx"> BC2652131182608100243E12 /* DrawingAreaProxy.h */,
</span><span class="cx"> 1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
</span><span class="lines">@@ -5988,6 +5991,7 @@
</span><span class="cx"> 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
</span><span class="cx"> 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
</span><span class="cx"> 511D81FF185BBDEE001AED56 /* SQLiteIDBTransaction.h in Headers */,
</span><ins>+ 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */,
</ins><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
</span><span class="cx"> 1AA417CB12C00CCA002BE67B /* TextChecker.h in Headers */,
</span><span class="cx"> 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */,
</span><span class="lines">@@ -6063,7 +6067,7 @@
</span><span class="cx"> BC032D7B10F4378D0058C15A /* WebDragClient.h in Headers */,
</span><span class="cx"> BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */,
</span><span class="cx"> BC032D7D10F4378D0058C15A /* WebEditorClient.h in Headers */,
</span><del>- 516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */,
</del><ins>+ 516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */,
</ins><span class="cx"> 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */,
</span><span class="cx"> BC032DB910F4380F0058C15A /* WebEvent.h in Headers */,
</span><span class="cx"> BC032DBB10F4380F0058C15A /* WebEventConversion.h in Headers */,
</span><span class="lines">@@ -7427,7 +7431,7 @@
</span><span class="cx"> BCA0EFA012332642007D3CFB /* WebEditCommandProxy.cpp in Sources */,
</span><span class="cx"> BC111A5E112F4FBB00337BAB /* WebEditorClient.cpp in Sources */,
</span><span class="cx"> C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */,
</span><del>- BC575613126E0138006F0F12 /* WebError.cpp in Sources */,
</del><ins>+ BC575613126E0138006F0F12 /* APIError.cpp in Sources */,
</ins><span class="cx"> BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
</span><span class="cx"> C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
</span><span class="cx"> BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIData.h"
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "InjectedBundleDOMWindowExtension.h"
</span><span class="cx"> #include "InjectedBundleScriptWorld.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><del>-#include "WebError.h"
</del><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InjectedBundlePagePolicyClient.h"
</span><span class="cx">
</span><ins>+#include "APIError.h"
</ins><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><del>-#include "WebError.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (160970 => 160971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2013-12-22 01:04:16 UTC (rev 160970)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2013-12-22 02:18:51 UTC (rev 160971)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebErrors.h"
</span><span class="cx">
</span><del>-#import "WebError.h"
</del><ins>+#import "APIError.h"
</ins><span class="cx"> #import "WKError.h"
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="lines">@@ -64,32 +64,32 @@
</span><span class="cx">
</span><span class="cx"> ResourceError blockedError(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError cannotShowURLError(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError internalError(const URL& url)
</span><span class="cx"> {
</span><del>- return ResourceError(WebError::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
</del><ins>+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>