<!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>[169711] 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/169711">169711</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 13:53:11 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a WKError.h header and rename the existing WKError.h to WKErrorRef.h
https://bugs.webkit.org/show_bug.cgi?id=133657
Reviewed by Dan Bernstein.
* Shared/API/Cocoa/WebKit.h:
* Shared/API/c/WKErrorRef.cpp: Renamed from Source/WebKit2/Shared/API/c/WKError.cpp.
(WKErrorGetTypeID):
(WKErrorCopyWKErrorDomain):
(WKErrorCopyDomain):
(WKErrorGetErrorCode):
(WKErrorCopyFailingURL):
(WKErrorCopyLocalizedDescription):
* Shared/API/c/WKErrorRef.h: Renamed from Source/WebKit2/Shared/API/c/WKError.h.
* UIProcess/API/C/WKPage.h:
* UIProcess/API/C/WKPageLoaderClient.h:
* UIProcess/API/C/WebKit2_C.h:
* UIProcess/API/Cocoa/WKError.h: Copied from Source/WebKit2/Shared/API/Cocoa/WebKit.h.
* UIProcess/API/Cocoa/WKError.mm: Copied from Source/WebKit2/Shared/API/Cocoa/WebKit.h.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWebKith">trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageh">trunk/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWebKit2_Ch">trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
<li><a href="#trunkSourceWebKit2macMigrateHeadersToWebKit2make">trunk/Source/WebKit2/mac/MigrateHeadersToWebKit2.make</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorRefcpp">trunk/Source/WebKit2/Shared/API/c/WKErrorRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorRefh">trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKErrorh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKErrormm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm</a></li>
<li><a href="#trunkSourceWebKit2macWKErrorh">trunk/Source/WebKit2/mac/WKError.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorcpp">trunk/Source/WebKit2/Shared/API/c/WKError.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKErrorh">trunk/Source/WebKit2/Shared/API/c/WKError.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-06-09 Anders Carlsson <andersca@apple.com>
+
+ Add a WKError.h header and rename the existing WKError.h to WKErrorRef.h
+ https://bugs.webkit.org/show_bug.cgi?id=133657
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/Cocoa/WebKit.h:
+ * Shared/API/c/WKErrorRef.cpp: Renamed from Source/WebKit2/Shared/API/c/WKError.cpp.
+ (WKErrorGetTypeID):
+ (WKErrorCopyWKErrorDomain):
+ (WKErrorCopyDomain):
+ (WKErrorGetErrorCode):
+ (WKErrorCopyFailingURL):
+ (WKErrorCopyLocalizedDescription):
+ * Shared/API/c/WKErrorRef.h: Renamed from Source/WebKit2/Shared/API/c/WKError.h.
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/C/WKPageLoaderClient.h:
+ * UIProcess/API/C/WebKit2_C.h:
+ * UIProcess/API/Cocoa/WKError.h: Copied from Source/WebKit2/Shared/API/Cocoa/WebKit.h.
+ * UIProcess/API/Cocoa/WKError.mm: Copied from Source/WebKit2/Shared/API/Cocoa/WebKit.h.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+
</ins><span class="cx"> 2014-06-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Use different AppKit API for all services menus
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWebKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKBackForwardList.h>
</span><span class="cx"> #import <WebKit/WKBackForwardListItem.h>
</span><ins>+#import <WebKit/WKError.h>
</ins><span class="cx"> #import <WebKit/WKFoundation.h>
</span><span class="cx"> #import <WebKit/WKFrameInfo.h>
</span><span class="cx"> #import <WebKit/WKNavigation.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKError.cpp (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKError.cpp 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/Shared/API/c/WKError.cpp 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -1,62 +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 "WKError.h"
-
-#include "APIError.h"
-#include "WKAPICast.h"
-
-using namespace WebKit;
-
-WKTypeID WKErrorGetTypeID()
-{
- return toAPI(API::Error::APIType);
-}
-
-WKStringRef WKErrorCopyWKErrorDomain()
-{
- return toCopiedAPI(API::Error::webKitErrorDomain());
-}
-
-WKStringRef WKErrorCopyDomain(WKErrorRef errorRef)
-{
- return toCopiedAPI(toImpl(errorRef)->domain());
-}
-
-int WKErrorGetErrorCode(WKErrorRef errorRef)
-{
- return toImpl(errorRef)->errorCode();
-}
-
-WKURLRef WKErrorCopyFailingURL(WKErrorRef errorRef)
-{
- return toCopiedURLAPI(toImpl(errorRef)->failingURL());
-}
-
-WKStringRef WKErrorCopyLocalizedDescription(WKErrorRef errorRef)
-{
- return toCopiedAPI(toImpl(errorRef)->localizedDescription());
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKError.h (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKError.h 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/Shared/API/c/WKError.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -1,63 +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 WKError_h
-#define WKError_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
- kWKErrorCodeCannotShowMIMEType = 100,
- kWKErrorCodeCannotShowURL = 101,
- kWKErrorCodeFrameLoadInterruptedByPolicyChange = 102,
- kWKErrorCodeCannotUseRestrictedPort = 103,
- kWKErrorCodeCannotFindPlugIn = 200,
- kWKErrorCodeCannotLoadPlugIn = 201,
- kWKErrorCodeJavaUnavailable = 202,
- kWKErrorCodePlugInCancelledConnection = 203,
- kWKErrorCodePlugInWillHandleLoad = 204,
- kWKErrorCodeInsecurePlugInVersion = 205,
- kWKErrorInternal = 300,
-};
-typedef uint32_t WKErrorCode;
-
-WK_EXPORT WKTypeID WKErrorGetTypeID();
-
-WK_EXPORT WKStringRef WKErrorCopyWKErrorDomain();
-
-WK_EXPORT WKStringRef WKErrorCopyDomain(WKErrorRef error);
-WK_EXPORT int WKErrorGetErrorCode(WKErrorRef error);
-WK_EXPORT WKURLRef WKErrorCopyFailingURL(WKErrorRef error);
-WK_EXPORT WKStringRef WKErrorCopyLocalizedDescription(WKErrorRef error);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKError_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorRefcppfromrev169710trunkSourceWebKit2SharedAPIcWKErrorcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/c/WKErrorRef.cpp (from rev 169710, trunk/Source/WebKit2/Shared/API/c/WKError.cpp) (0 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKErrorRef.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKErrorRef.cpp 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -0,0 +1,62 @@
</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 "WKErrorRef.h"
+
+#include "APIError.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKErrorGetTypeID()
+{
+ return toAPI(API::Error::APIType);
+}
+
+WKStringRef WKErrorCopyWKErrorDomain()
+{
+ return toCopiedAPI(API::Error::webKitErrorDomain());
+}
+
+WKStringRef WKErrorCopyDomain(WKErrorRef errorRef)
+{
+ return toCopiedAPI(toImpl(errorRef)->domain());
+}
+
+int WKErrorGetErrorCode(WKErrorRef errorRef)
+{
+ return toImpl(errorRef)->errorCode();
+}
+
+WKURLRef WKErrorCopyFailingURL(WKErrorRef errorRef)
+{
+ return toCopiedURLAPI(toImpl(errorRef)->failingURL());
+}
+
+WKStringRef WKErrorCopyLocalizedDescription(WKErrorRef errorRef)
+{
+ return toCopiedAPI(toImpl(errorRef)->localizedDescription());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKErrorRefhfromrev169710trunkSourceWebKit2SharedAPIcWKErrorh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h (from rev 169710, trunk/Source/WebKit2/Shared/API/c/WKError.h) (0 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKErrorRef.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -0,0 +1,63 @@
</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 WKErrorRef_h
+#define WKErrorRef_h
+
+#include <WebKit/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+ kWKErrorCodeCannotShowMIMEType = 100,
+ kWKErrorCodeCannotShowURL = 101,
+ kWKErrorCodeFrameLoadInterruptedByPolicyChange = 102,
+ kWKErrorCodeCannotUseRestrictedPort = 103,
+ kWKErrorCodeCannotFindPlugIn = 200,
+ kWKErrorCodeCannotLoadPlugIn = 201,
+ kWKErrorCodeJavaUnavailable = 202,
+ kWKErrorCodePlugInCancelledConnection = 203,
+ kWKErrorCodePlugInWillHandleLoad = 204,
+ kWKErrorCodeInsecurePlugInVersion = 205,
+ kWKErrorInternal = 300,
+};
+typedef uint32_t WKErrorCode;
+
+WK_EXPORT WKTypeID WKErrorGetTypeID();
+
+WK_EXPORT WKStringRef WKErrorCopyWKErrorDomain();
+
+WK_EXPORT WKStringRef WKErrorCopyDomain(WKErrorRef error);
+WK_EXPORT int WKErrorGetErrorCode(WKErrorRef error);
+WK_EXPORT WKURLRef WKErrorCopyFailingURL(WKErrorRef error);
+WK_EXPORT WKStringRef WKErrorCopyLocalizedDescription(WKErrorRef error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // WKErrorRef_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKPage_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><del>-#include <WebKit/WKError.h>
</del><ins>+#include <WebKit/WKErrorRef.h>
</ins><span class="cx"> #include <WebKit/WKEvent.h>
</span><span class="cx"> #include <WebKit/WKFindOptions.h>
</span><span class="cx"> #include <WebKit/WKGeometry.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKPageLoaderClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><del>-#include <WebKit/WKError.h>
</del><ins>+#include <WebKit/WKErrorRef.h>
</ins><span class="cx"> #include <WebKit/WKPageLoadTypes.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWebKit2_Ch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <WebKit/WKContext.h>
</span><span class="cx"> #include <WebKit/WKData.h>
</span><span class="cx"> #include <WebKit/WKDictionary.h>
</span><del>-#include <WebKit/WKError.h>
</del><ins>+#include <WebKit/WKErrorRef.h>
</ins><span class="cx"> #include <WebKit/WKFormSubmissionListener.h>
</span><span class="cx"> #include <WebKit/WKFrame.h>
</span><span class="cx"> #include <WebKit/WKFramePolicyListener.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKErrorhfromrev169710trunkSourceWebKit2SharedAPICocoaWebKith"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h (from rev 169710, trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h) (0 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_EXTERN NSString * const WKErrorDomain WK_AVAILABLE(10_0, 8_0);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKErrormmfromrev169710trunkSourceWebKit2SharedAPICocoaWebKith"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm (from rev 169710, trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h) (0 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKError.h"
+
+#if WK_API_ENABLED
+
+NSString * const WKErrorDomain = @"WKErrorDomain";
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -452,6 +452,9 @@
</span><span class="cx"> 1AF1AC6B1651759E00C17D7F /* RemoteLayerTreeTransaction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */; };
</span><span class="cx"> 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */; };
</span><span class="cx"> 1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 1AF4592E19464B2000F9D4A2 /* WKError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4592C19464B2000F9D4A2 /* WKError.mm */; };
+ 1AF4592F19464B2000F9D4A2 /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4592D19464B2000F9D4A2 /* WKError.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1AF459321946559500F9D4A2 /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF459301946540700F9D4A2 /* WKError.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */; };
</span><span class="cx"> 1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */; };
</span><span class="cx"> 1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */; };
</span><span class="lines">@@ -1216,8 +1219,8 @@
</span><span class="cx"> BC4075F8124FF0270068F20A /* WKData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075DC124FF0270068F20A /* WKData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC4075F9124FF0270068F20A /* WKDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075DD124FF0270068F20A /* WKDictionary.cpp */; };
</span><span class="cx"> BC4075FA124FF0270068F20A /* WKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075DE124FF0270068F20A /* WKDictionary.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC4075FB124FF0270068F20A /* WKError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075DF124FF0270068F20A /* WKError.cpp */; };
- BC4075FC124FF0270068F20A /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075E0124FF0270068F20A /* WKError.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ BC4075FB124FF0270068F20A /* WKErrorRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075DF124FF0270068F20A /* WKErrorRef.cpp */; };
+ BC4075FC124FF0270068F20A /* WKErrorRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075E0124FF0270068F20A /* WKErrorRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075E1124FF0270068F20A /* WKMutableArray.cpp */; };
</span><span class="cx"> BC4075FE124FF0270068F20A /* WKMutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075E2124FF0270068F20A /* WKMutableArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC4075FF124FF0270068F20A /* WKMutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075E3124FF0270068F20A /* WKMutableDictionary.cpp */; };
</span><span class="lines">@@ -2399,6 +2402,9 @@
</span><span class="cx"> 1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreeTransaction.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeTransaction.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationActionPrivate.h; sourceTree = "<group>"; };
</span><ins>+ 1AF4592C19464B2000F9D4A2 /* WKError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKError.mm; sourceTree = "<group>"; };
+ 1AF4592D19464B2000F9D4A2 /* WKError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKError.h; sourceTree = "<group>"; };
+ 1AF459301946540700F9D4A2 /* WKError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKError.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTableController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTableController.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKUserContentController.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3257,8 +3263,8 @@
</span><span class="cx"> BC4075DC124FF0270068F20A /* WKData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKData.h; sourceTree = "<group>"; };
</span><span class="cx"> BC4075DD124FF0270068F20A /* WKDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDictionary.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC4075DE124FF0270068F20A /* WKDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDictionary.h; sourceTree = "<group>"; };
</span><del>- BC4075DF124FF0270068F20A /* WKError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKError.cpp; sourceTree = "<group>"; };
- BC4075E0124FF0270068F20A /* WKError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKError.h; sourceTree = "<group>"; };
</del><ins>+ BC4075DF124FF0270068F20A /* WKErrorRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKErrorRef.cpp; sourceTree = "<group>"; };
+ BC4075E0124FF0270068F20A /* WKErrorRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorRef.h; sourceTree = "<group>"; };
</ins><span class="cx"> BC4075E1124FF0270068F20A /* WKMutableArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMutableArray.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC4075E2124FF0270068F20A /* WKMutableArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMutableArray.h; sourceTree = "<group>"; };
</span><span class="cx"> BC4075E3124FF0270068F20A /* WKMutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMutableDictionary.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4152,6 +4158,7 @@
</span><span class="cx"> 1A6280EE19199800006AD9F9 /* WebKit2.m */,
</span><span class="cx"> 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */,
</span><span class="cx"> 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */,
</span><ins>+ 1AF459301946540700F9D4A2 /* WKError.h */,
</ins><span class="cx"> 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */,
</span><span class="cx"> );
</span><span class="cx"> name = "WebKit2 Framework";
</span><span class="lines">@@ -4949,6 +4956,8 @@
</span><span class="cx"> 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */,
</span><span class="cx"> 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */,
</span><span class="cx"> 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */,
</span><ins>+ 1AF4592D19464B2000F9D4A2 /* WKError.h */,
+ 1AF4592C19464B2000F9D4A2 /* WKError.mm */,
</ins><span class="cx"> 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
</span><span class="cx"> 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
</span><span class="cx"> 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</span><span class="lines">@@ -6593,8 +6602,8 @@
</span><span class="cx"> 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */,
</span><span class="cx"> BC4075DD124FF0270068F20A /* WKDictionary.cpp */,
</span><span class="cx"> BC4075DE124FF0270068F20A /* WKDictionary.h */,
</span><del>- BC4075DF124FF0270068F20A /* WKError.cpp */,
- BC4075E0124FF0270068F20A /* WKError.h */,
</del><ins>+ BC4075DF124FF0270068F20A /* WKErrorRef.cpp */,
+ BC4075E0124FF0270068F20A /* WKErrorRef.h */,
</ins><span class="cx"> BC40783C1250FADD0068F20A /* WKEvent.h */,
</span><span class="cx"> 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */,
</span><span class="cx"> 0F174AA6142AAC610039250F /* WKGeometry.cpp */,
</span><span class="lines">@@ -6929,6 +6938,7 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
</span><ins>+ 1AF459321946559500F9D4A2 /* WKError.h in Headers */,
</ins><span class="cx"> E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="lines">@@ -7588,6 +7598,7 @@
</span><span class="cx"> 1AB8A1EE18400ACB00E9AE69 /* WKPagePolicyClient.h in Headers */,
</span><span class="cx"> 37183D57182F4E700080C811 /* WKNSURLExtras.h in Headers */,
</span><span class="cx"> BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */,
</span><ins>+ 1AF4592F19464B2000F9D4A2 /* WKError.h in Headers */,
</ins><span class="cx"> 1A1B0EB618A424950038481A /* WKNavigationResponse.h in Headers */,
</span><span class="cx"> 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */,
</span><span class="cx"> 1AE00D5D182DADE100087DD7 /* KeyedEncoder.h in Headers */,
</span><span class="lines">@@ -7610,7 +7621,7 @@
</span><span class="cx"> 370F34A31829BE1E009027C8 /* WKNavigationData.h in Headers */,
</span><span class="cx"> 1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */,
</span><span class="cx"> 1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */,
</span><del>- BC4075FC124FF0270068F20A /* WKError.h in Headers */,
</del><ins>+ BC4075FC124FF0270068F20A /* WKErrorRef.h in Headers */,
</ins><span class="cx"> BCFD548C132D82680055D816 /* WKErrorCF.h in Headers */,
</span><span class="cx"> BC40783D1250FADD0068F20A /* WKEvent.h in Headers */,
</span><span class="cx"> 37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */,
</span><span class="lines">@@ -8632,6 +8643,7 @@
</span><span class="cx"> BCEE966C112FAF57006BCC24 /* Attachment.cpp in Sources */,
</span><span class="cx"> C54256B618BEC18C00DE4179 /* WKFormInputControl.mm in Sources */,
</span><span class="cx"> E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */,
</span><ins>+ 1AF4592E19464B2000F9D4A2 /* WKError.mm in Sources */,
</ins><span class="cx"> 512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
</span><span class="cx"> 1AE00D4C182D6EB000087DD7 /* WKBrowsingContextHandle.mm in Sources */,
</span><span class="cx"> 512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
</span><span class="lines">@@ -9248,7 +9260,7 @@
</span><span class="cx"> BC017D2016263308007054F5 /* WKDOMTextIterator.mm in Sources */,
</span><span class="cx"> 1AB7D78E1288CD9A00CFD08C /* WKDownload.cpp in Sources */,
</span><span class="cx"> 0F594792187B3B3A00437857 /* RemoteScrollingCoordinator.mm in Sources */,
</span><del>- BC4075FB124FF0270068F20A /* WKError.cpp in Sources */,
</del><ins>+ BC4075FB124FF0270068F20A /* WKErrorRef.cpp in Sources */,
</ins><span class="cx"> BCFD548B132D82680055D816 /* WKErrorCF.cpp in Sources */,
</span><span class="cx"> BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */,
</span><span class="cx"> BCD0139C110FA420003B8A67 /* WKFrame.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #import "WebErrors.h"
</span><span class="cx">
</span><span class="cx"> #import "APIError.h"
</span><del>-#import "WKError.h"
</del><ins>+#import "WKErrorRef.h"
</ins><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/ResourceResponse.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2macMigrateHeadersToWebKit2make"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/MigrateHeadersToWebKit2.make (169710 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/MigrateHeadersToWebKit2.make 2014-06-09 20:39:17 UTC (rev 169710)
+++ trunk/Source/WebKit2/mac/MigrateHeadersToWebKit2.make 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
</span><span class="cx">
</span><del>-WEBKIT2_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*.h))) $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WKPreferences.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*.h))))
</del><ins>+WEBKIT2_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*.h))) $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WKPreferences.h WKError.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*.h))))
</ins><span class="cx">
</span><span class="cx"> all : $(WEBKIT2_HEADERS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2macWKErrorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/mac/WKError.h (0 => 169711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/WKError.h (rev 0)
+++ trunk/Source/WebKit2/mac/WKError.h 2014-06-09 20:53:11 UTC (rev 169711)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#import <WebKit/WKErrorRef.h>
</ins></span></pre>
</div>
</div>
</body>
</html>