<!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>[214934] trunk/Source</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/214934">214934</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-05 00:41:53 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
https://bugs.webkit.org/show_bug.cgi?id=156974
Reviewed by Sam Weinig.
Source/WebCore:
Remove ErrorsGtk.
* PlatformGTK.cmake:
* platform/gtk/ErrorsGtk.cpp: Removed.
* platform/gtk/ErrorsGtk.h: Removed.
Source/WebCore/platform/gtk/po:
* POTFILES.in: Add new paths with translatable strings.
Source/WebKit2:
WebErrors are not only used by the frame loader client in the web process, but also by the network process. So,
move them to Shared make most of the implementation cross-platform.
* CMakeLists.txt: Add new files to compilation.
* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::download): Use WebErrors directly instead of platform methods that are no longer needed.
(WebKit::NetworkDataTaskSoup::writeDownloadCallback): Ditto.
(WebKit::NetworkDataTaskSoup::didFinishDownload): Ditto.
(WebKit::NetworkDataTaskSoup::didFail): Ditto.
* PlatformGTK.cmake: Add new files to compilation and remove DownloadSoupErrorsGtk.cpp
* PlatformMac.cmake:
* Shared/API/APIError.cpp: Add error domains used by glib based ports.
(API::Error::webKitNetworkErrorDomain):
(API::Error::webKitPolicyErrorDomain):
(API::Error::webKitPluginErrorDomain):
(API::Error::webKitDownloadErrorDomain):
(API::Error::webKitPrintErrorDomain):
* Shared/API/APIError.h:
* Shared/Cocoa/WebErrorsCocoa.mm: Copied from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
(WebKit::createNSError):
(WebKit::cancelledError):
(WebKit::fileDoesNotExistError):
* Shared/WebErrors.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
(WebKit::blockedError):
(WebKit::blockedByContentBlockerError):
(WebKit::cannotShowURLError):
(WebKit::interruptedForPolicyChangeError):
(WebKit::blockedByContentFilterError):
(WebKit::cannotShowMIMETypeError):
(WebKit::pluginWillHandleLoadError):
(WebKit::internalError):
* Shared/WebErrors.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
* Shared/glib/WebErrorsGlib.cpp: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
(WebKit::cancelledError):
(WebKit::fileDoesNotExistError):
* Shared/gtk/WebErrorsGtk.cpp: Copied from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
(WebKit::printError):
(WebKit::printerNotFoundError):
(WebKit::invalidPageRangeToPrint):
* Shared/soup/WebErrorsSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
(WebKit::downloadNetworkError):
(WebKit::downloadCancelledByUserError):
(WebKit::downloadDestinationError):
* UIProcess/API/gtk/WebKitDownload.cpp:
* UIProcess/API/gtk/WebKitError.cpp:
(webkit_network_error_quark):
(webkit_policy_error_quark):
(webkit_plugin_error_quark):
(webkit_download_error_quark):
(webkit_print_error_quark):
* UIProcess/API/gtk/WebKitPrivate.cpp:
(toWebKitError):
(toWebCoreError):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm: Removed.
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkpoChangeLog">trunk/Source/WebCore/platform/gtk/po/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkpoPOTFILESin">trunk/Source/WebCore/platform/gtk/po/POTFILES.in</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkDataTaskSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIErrorcpp">trunk/Source/WebKit2/Shared/API/APIError.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIErrorh">trunk/Source/WebKit2/Shared/API/APIError.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitErrorcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedCocoaWebErrorsCocoamm">trunk/Source/WebKit2/Shared/Cocoa/WebErrorsCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebErrorscpp">trunk/Source/WebKit2/Shared/WebErrors.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebErrorsh">trunk/Source/WebKit2/Shared/WebErrors.h</a></li>
<li><a href="#trunkSourceWebKit2SharedglibWebErrorsGlibcpp">trunk/Source/WebKit2/Shared/glib/WebErrorsGlib.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebErrorsGtkcpp">trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupWebErrorsSoupcpp">trunk/Source/WebKit2/Shared/soup/WebErrorsSoup.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkErrorsGtkcpp">trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkErrorsGtkh">trunk/Source/WebCore/platform/gtk/ErrorsGtk.h</a></li>
<li>trunk/Source/WebKit2/NetworkProcess/Downloads/gtk/</li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebErrorsGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=156974
+
+ Reviewed by Sam Weinig.
+
+ Remove ErrorsGtk.
+
+ * PlatformGTK.cmake:
+ * platform/gtk/ErrorsGtk.cpp: Removed.
+ * platform/gtk/ErrorsGtk.h: Removed.
+
</ins><span class="cx"> 2017-04-05 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [ios-simulator] API test WebKit2.DataDetectionReferenceDate timing out
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> platform/graphics/x11/XUniqueResource.cpp
</span><span class="cx">
</span><span class="cx"> platform/gtk/DragDataGtk.cpp
</span><del>- platform/gtk/ErrorsGtk.cpp
</del><span class="cx"> platform/gtk/LocalizedStringsGtk.cpp
</span><span class="cx"> platform/gtk/PasteboardGtk.cpp
</span><span class="cx"> platform/gtk/ScrollAnimatorGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkErrorsGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "ErrorsGtk.h"
-
-#include "ResourceError.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
-#include <glib/gi18n-lib.h>
-
-namespace WebCore {
-
-ResourceError cancelledError(const ResourceRequest& request)
-{
- return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url(), _("Load request cancelled"));
-}
-
-ResourceError blockedError(const ResourceRequest& request)
-{
- return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url(), _("Not allowed to use restricted network port"));
-}
-
-ResourceError blockedByContentBlockerError(const ResourceRequest& request)
-{
- return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url(), _("Blocked by content blocker"));
-}
-
-ResourceError cannotShowURLError(const ResourceRequest& request)
-{
- return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url(), _("URL cannot be shown"));
-}
-
-ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
-{
- return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url(), _("Frame load was interrupted"));
-}
-
-ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
-{
- return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url(), _("Content with the specified MIME type cannot be shown"));
-}
-
-ResourceError fileDoesNotExistError(const ResourceResponse& response)
-{
- return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url(), _("File does not exist"));
-}
-
-ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
-{
- return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url(), _("Plugin will handle load"));
-}
-
-ResourceError downloadNetworkError(const ResourceError& networkError)
-{
- return ResourceError(errorDomainDownload, DownloadErrorNetwork, networkError.failingURL(), networkError.localizedDescription());
-}
-
-ResourceError downloadCancelledByUserError(const ResourceResponse& response)
-{
- return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url(), _("User cancelled the download"));
-}
-
-ResourceError downloadDestinationError(const ResourceResponse& response, const String& errorMessage)
-{
- return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url(), errorMessage);
-}
-
-ResourceError printError(const URL& failingURL, const String& errorMessage)
-{
- return ResourceError(errorDomainPrint, PrintErrorGeneral, failingURL, errorMessage);
-}
-
-ResourceError printerNotFoundError(const URL& failingURL)
-{
- return ResourceError(errorDomainPrint, PrintErrorPrinterNotFound, failingURL, _("Printer not found"));
-}
-
-ResourceError invalidPageRangeToPrint(const URL& failingURL)
-{
- return ResourceError(errorDomainPrint, PrintErrorInvalidPageRange, failingURL, _("Invalid page range"));
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkErrorsGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/ErrorsGtk.h (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ErrorsGtk.h 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/platform/gtk/ErrorsGtk.h 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,94 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef ErrorsGtk_h
-#define ErrorsGtk_h
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class ResourceError;
-class ResourceRequest;
-class ResourceResponse;
-class URL;
-
-const char* const errorDomainNetwork = "WebKitNetworkError";
-const char* const errorDomainPolicy = "WebKitPolicyError";
-const char* const errorDomainPlugin = "WebKitPluginError";
-const char* const errorDomainDownload = "WebKitDownloadError";
-const char* const errorDomainPrint = "WebKitPrintError";
-
-enum NetworkError {
- NetworkErrorFailed = 399,
- NetworkErrorTransport = 300,
- NetworkErrorUnknownProtocol = 301,
- NetworkErrorCancelled = 302,
- NetworkErrorFileDoesNotExist = 303
-};
-
-// Sync'd with Mac's WebKit Errors.
-enum PolicyError {
- PolicyErrorFailed = 199,
- PolicyErrorCannotShowMimeType = 100,
- PolicyErrorCannotShowURL = 101,
- PolicyErrorFrameLoadInterruptedByPolicyChange = 102,
- PolicyErrorCannotUseRestrictedPort = 103,
- PolicyErrorBlockedByContentBlocker = 104,
-};
-
-enum PluginError {
- PluginErrorFailed = 299,
- PluginErrorCannotFindPlugin = 200,
- PluginErrorCannotLoadPlugin = 201,
- PluginErrorJavaUnavailable = 202,
- PluginErrorConnectionCancelled = 203,
- PluginErrorWillHandleLoad = 204
-};
-
-enum DownloadError {
- DownloadErrorNetwork = 499,
- DownloadErrorCancelledByUser = 400,
- DownloadErrorDestination = 401
-};
-
-enum PrintError {
- PrintErrorGeneral = 599,
- PrintErrorPrinterNotFound = 500,
- PrintErrorInvalidPageRange = 501
-};
-
-ResourceError cancelledError(const ResourceRequest&);
-ResourceError blockedError(const ResourceRequest&);
-ResourceError blockedByContentBlockerError(const ResourceRequest&);
-ResourceError cannotShowURLError(const ResourceRequest&);
-ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
-ResourceError cannotShowMIMETypeError(const ResourceResponse&);
-ResourceError fileDoesNotExistError(const ResourceResponse&);
-ResourceError pluginWillHandleLoadError(const ResourceResponse&);
-ResourceError downloadNetworkError(const ResourceError&);
-ResourceError downloadCancelledByUserError(const ResourceResponse&);
-ResourceError downloadDestinationError(const ResourceResponse&, const String& errorMessage);
-ResourceError printError(const URL& failingURL, const String& errorMessage);
-ResourceError printerNotFoundError(const URL& failingURL);
-ResourceError invalidPageRangeToPrint(const URL& failingURL);
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkpoChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/po/ChangeLog (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/po/ChangeLog 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/platform/gtk/po/ChangeLog 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-04-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=156974
+
+ Reviewed by Sam Weinig.
+
+ * POTFILES.in: Add new paths with translatable strings.
+
</ins><span class="cx"> 2017-03-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to use WEB_UI_STRING macros to mark translatable strings in glib based ports
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkpoPOTFILESin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/po/POTFILES.in (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,7 +1,10 @@
</span><span class="cx"> # List of source files which contain translatable strings.
</span><del>-ErrorsGtk.cpp
</del><span class="cx"> LocalizedStringsGtk.cpp
</span><span class="cx"> ../LocalizedStrings.cpp
</span><ins>+../../../WebKit2/Shared/WebErrors.cpp
+../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
+../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
+../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
</ins><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitDownload.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -189,6 +189,7 @@
</span><span class="cx"> Shared/WebContextMenuItem.cpp
</span><span class="cx"> Shared/WebContextMenuItemData.cpp
</span><span class="cx"> Shared/WebCoreArgumentCoders.cpp
</span><ins>+ Shared/WebErrors.cpp
</ins><span class="cx"> Shared/WebEvent.cpp
</span><span class="cx"> Shared/WebEventConversion.cpp
</span><span class="cx"> Shared/WebGeolocationPosition.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2017-04-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=156974
+
+ Reviewed by Sam Weinig.
+
+ WebErrors are not only used by the frame loader client in the web process, but also by the network process. So,
+ move them to Shared make most of the implementation cross-platform.
+
+ * CMakeLists.txt: Add new files to compilation.
+ * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+ (WebKit::NetworkDataTaskSoup::download): Use WebErrors directly instead of platform methods that are no longer needed.
+ (WebKit::NetworkDataTaskSoup::writeDownloadCallback): Ditto.
+ (WebKit::NetworkDataTaskSoup::didFinishDownload): Ditto.
+ (WebKit::NetworkDataTaskSoup::didFail): Ditto.
+ * PlatformGTK.cmake: Add new files to compilation and remove DownloadSoupErrorsGtk.cpp
+ * PlatformMac.cmake:
+ * Shared/API/APIError.cpp: Add error domains used by glib based ports.
+ (API::Error::webKitNetworkErrorDomain):
+ (API::Error::webKitPolicyErrorDomain):
+ (API::Error::webKitPluginErrorDomain):
+ (API::Error::webKitDownloadErrorDomain):
+ (API::Error::webKitPrintErrorDomain):
+ * Shared/API/APIError.h:
+ * Shared/Cocoa/WebErrorsCocoa.mm: Copied from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
+ (WebKit::createNSError):
+ (WebKit::cancelledError):
+ (WebKit::fileDoesNotExistError):
+ * Shared/WebErrors.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
+ (WebKit::blockedError):
+ (WebKit::blockedByContentBlockerError):
+ (WebKit::cannotShowURLError):
+ (WebKit::interruptedForPolicyChangeError):
+ (WebKit::blockedByContentFilterError):
+ (WebKit::cannotShowMIMETypeError):
+ (WebKit::pluginWillHandleLoadError):
+ (WebKit::internalError):
+ * Shared/WebErrors.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
+ * Shared/glib/WebErrorsGlib.cpp: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
+ (WebKit::cancelledError):
+ (WebKit::fileDoesNotExistError):
+ * Shared/gtk/WebErrorsGtk.cpp: Copied from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
+ (WebKit::printError):
+ (WebKit::printerNotFoundError):
+ (WebKit::invalidPageRangeToPrint):
+ * Shared/soup/WebErrorsSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
+ (WebKit::downloadNetworkError):
+ (WebKit::downloadCancelledByUserError):
+ (WebKit::downloadDestinationError):
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ * UIProcess/API/gtk/WebKitError.cpp:
+ (webkit_network_error_quark):
+ (webkit_policy_error_quark):
+ (webkit_plugin_error_quark):
+ (webkit_download_error_quark):
+ (webkit_print_error_quark):
+ * UIProcess/API/gtk/WebKitPrivate.cpp:
+ (toWebKitError):
+ (toWebCoreError):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm: Removed.
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
+
</ins><span class="cx"> 2017-04-04 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add back web audio support for getUserMedia MediaStreamTrack
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkDataTaskSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> ASSERT(!m_response.isNull());
</span><span class="cx">
</span><span class="cx"> if (m_response.httpStatusCode() >= 400) {
</span><del>- didFailDownload(platformDownloadNetworkError(m_response.httpStatusCode(), m_response.url(), m_response.httpStatusText()));
</del><ins>+ didFailDownload(downloadNetworkError(m_response.url(), m_response.httpStatusText()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx"> else
</span><span class="cx"> outputStream = adoptGRef(g_file_create(m_downloadDestinationFile.get(), G_FILE_CREATE_NONE, nullptr, &error.outPtr()));
</span><span class="cx"> if (!outputStream) {
</span><del>- didFailDownload(platformDownloadDestinationError(m_response, error->message));
</del><ins>+ didFailDownload(downloadDestinationError(m_response, error->message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> m_downloadIntermediateFile = adoptGRef(g_file_new_for_uri(intermediateURI.get()));
</span><span class="cx"> outputStream = adoptGRef(g_file_replace(m_downloadIntermediateFile.get(), 0, TRUE, G_FILE_CREATE_NONE, 0, &error.outPtr()));
</span><span class="cx"> if (!outputStream) {
</span><del>- didFailDownload(platformDownloadDestinationError(m_response, error->message));
</del><ins>+ didFailDownload(downloadDestinationError(m_response, error->message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_downloadOutputStream = adoptGRef(G_OUTPUT_STREAM(outputStream.leakRef()));
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> bytesWritten = writeTaskResult;
</span><span class="cx"> #endif
</span><span class="cx"> if (error)
</span><del>- task->didFailDownload(platformDownloadDestinationError(task->m_response, error->message));
</del><ins>+ task->didFailDownload(downloadDestinationError(task->m_response, error->message));
</ins><span class="cx"> else
</span><span class="cx"> task->didWriteDownload(bytesWritten);
</span><span class="cx"> }
</span><span class="lines">@@ -982,7 +982,7 @@
</span><span class="cx"> ASSERT(m_downloadIntermediateFile);
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> if (!g_file_move(m_downloadIntermediateFile.get(), m_downloadDestinationFile.get(), G_FILE_COPY_OVERWRITE, m_cancellable.get(), nullptr, nullptr, &error.outPtr())) {
</span><del>- didFailDownload(platformDownloadDestinationError(m_response, error->message));
</del><ins>+ didFailDownload(downloadDestinationError(m_response, error->message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> void NetworkDataTaskSoup::didFail(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> if (isDownload()) {
</span><del>- didFailDownload(platformDownloadNetworkError(error.errorCode(), error.failingURL(), error.localizedDescription()));
</del><ins>+ didFailDownload(downloadNetworkError(error.failingURL(), error.localizedDescription()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
</span><span class="cx">
</span><del>- NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
-
</del><span class="cx"> NetworkProcess/cache/NetworkCacheCodersSoup.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheDataSoup.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
</span><span class="lines">@@ -75,6 +73,8 @@
</span><span class="cx">
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><ins>+ Shared/glib/WebErrorsGlib.cpp
+
</ins><span class="cx"> Shared/gtk/ArgumentCodersGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebKeyboardEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebMouseEventGtk.cpp
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> Shared/gtk/PrintInfoGtk.cpp
</span><span class="cx"> Shared/gtk/ProcessExecutablePathGtk.cpp
</span><span class="cx"> Shared/gtk/WebContextMenuItemGtk.cpp
</span><ins>+ Shared/gtk/WebErrorsGtk.cpp
</ins><span class="cx"> Shared/gtk/WebEventFactory.cpp
</span><span class="cx"> Shared/gtk/WebSelectionData.cpp
</span><span class="cx">
</span><span class="lines">@@ -89,6 +90,7 @@
</span><span class="cx"> Shared/linux/WebMemorySamplerLinux.cpp
</span><span class="cx">
</span><span class="cx"> Shared/soup/WebCoreArgumentCodersSoup.cpp
</span><ins>+ Shared/soup/WebErrorsSoup.cpp
</ins><span class="cx">
</span><span class="cx"> Shared/unix/ChildProcessMain.cpp
</span><span class="cx">
</span><span class="lines">@@ -475,7 +477,6 @@
</span><span class="cx"> WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
</span><del>- WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
</del><span class="cx"> WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx"> Shared/Cocoa/WKNSURLExtras.mm
</span><span class="cx"> Shared/Cocoa/WKNSURLRequest.mm
</span><span class="cx"> Shared/Cocoa/WKObject.mm
</span><ins>+ Shared/Cocoa/WebErrorsCocoa.mm
</ins><span class="cx">
</span><span class="cx"> Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
</span><span class="cx"> Shared/Plugins/Netscape/mac/PluginInformationMac.mm
</span><span class="lines">@@ -355,7 +356,6 @@
</span><span class="cx"> WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
</span><span class="cx"> WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
</span><span class="cx"> WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
</span><del>- WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
</del><span class="cx"> WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
</span><span class="cx"> WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm
</span><span class="cx"> WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIError.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIError.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/Shared/API/APIError.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -38,6 +38,52 @@
</span><span class="cx"> return webKitErrorDomainString;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const WTF::String& Error::webKitNetworkErrorDomain()
+{
+#if USE(GLIB)
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitNetworkError"));
+ return webKitErrorDomainString;
+#else
+ return webKitErrorDomain();
+#endif
+}
+
+const WTF::String& Error::webKitPolicyErrorDomain()
+{
+#if USE(GLIB)
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPolicyError"));
+ return webKitErrorDomainString;
+#else
+ return webKitErrorDomain();
+#endif
+}
+
+const WTF::String& Error::webKitPluginErrorDomain()
+{
+#if USE(GLIB)
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPluginError"));
+ return webKitErrorDomainString;
+#else
+ return webKitErrorDomain();
+#endif
+}
+
+#if USE(SOUP)
+const WTF::String& Error::webKitDownloadErrorDomain()
+{
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitDownloadError"));
+ return webKitErrorDomainString;
+}
+#endif
+
+#if PLATFORM(GTK)
+const WTF::String& Error::webKitPrintErrorDomain()
+{
+ static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPrintError"));
+ return webKitErrorDomainString;
+}
+#endif
+
</ins><span class="cx"> void Error::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << platformError();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIError.h (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIError.h 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/Shared/API/APIError.h 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -49,7 +49,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const WTF::String& webKitErrorDomain();
</span><ins>+ enum Network { Cancelled = 302, FileDoesNotExist = 303 };
+ static const WTF::String& webKitNetworkErrorDomain();
+ static const WTF::String& webKitPolicyErrorDomain();
+ static const WTF::String& webKitPluginErrorDomain();
+#if USE(SOUP)
+ enum Download { Transport = 499, CancelledByUser = 400, Destination = 401 };
+ static const WTF::String& webKitDownloadErrorDomain();
+#endif
+#if PLATFORM(GTK)
+ enum Print { General = 599, PrinterNotFound = 500, InvalidPageRange = 501 };
+ static const WTF::String& webKitPrintErrorDomain();
+#endif
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> const WTF::String& domain() const { return m_platformError.domain(); }
</span><span class="cx"> int errorCode() const { return m_platformError.errorCode(); }
</span><span class="cx"> const WTF::String& failingURL() const { return m_platformError.failingURL(); }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWebErrorsCocoammfromrev214933trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/Cocoa/WebErrorsCocoa.mm (from rev 214933, trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WebErrorsCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebErrorsCocoa.mm 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/*
+ * Copyright (C) 2010-2016 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 "WebErrors.h"
+
+#import "APIError.h"
+#import "WKErrorRef.h"
+#import <WebCore/LocalizedStrings.h>
+#import <WebCore/ResourceRequest.h>
+#import <WebCore/ResourceResponse.h>
+
+using namespace WebCore;
+using namespace WebKit;
+
+namespace WebKit {
+
+static RetainPtr<NSError> createNSError(NSString* domain, int code, NSURL *URL)
+{
+ NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
+ URL, @"NSErrorFailingURLKey",
+ [URL absoluteString], @"NSErrorFailingURLStringKey",
+ nil];
+
+ return adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:userInfo]);
+}
+
+ResourceError cancelledError(const ResourceRequest& request)
+{
+ return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorCancelled, request.url()).get());
+}
+
+ResourceError fileDoesNotExistError(const ResourceResponse& response)
+{
+ return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorFileDoesNotExist, response.url()).get());
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebErrorscppfromrev214933trunkSourceWebKit2WebProcessWebCoreSupportgtkWebErrorsGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebErrors.cpp (from rev 214933, trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebErrors.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/WebErrors.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+/*
+ * Copyright (C) 2010-2016 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 "WebErrors.h"
+
+#include "APIError.h"
+#include "WKErrorRef.h"
+#include <WebCore/LocalizedStrings.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ResourceError blockedError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
+}
+
+ResourceError blockedByContentBlockerError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
+}
+
+ResourceError cannotShowURLError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
+}
+
+ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
+}
+
+#if ENABLE(CONTENT_FILTERING)
+ResourceError blockedByContentFilterError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
+}
+#endif
+
+ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
+{
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
+}
+
+ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
+{
+ return ResourceError(API::Error::webKitPluginErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
+}
+
+ResourceError internalError(const URL& url)
+{
+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebErrorshfromrev214933trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebErrors.h (from rev 214933, trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebErrors.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebErrors.h 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2010-2016 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.
+ */
+
+#pragma once
+
+#include <wtf/Forward.h>
+
+namespace WebCore {
+class URL;
+class ResourceError;
+class ResourceRequest;
+class ResourceResponse;
+}
+
+namespace WebKit {
+
+WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
+WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
+WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&);
+WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
+WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
+#if ENABLE(CONTENT_FILTERING)
+WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&);
+#endif
+WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
+WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
+WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
+WebCore::ResourceError internalError(const WebCore::URL&);
+
+#if USE(SOUP)
+WebCore::ResourceError downloadNetworkError(const WebCore::URL&, const WTF::String&);
+WebCore::ResourceError downloadCancelledByUserError(const WebCore::ResourceResponse&);
+WebCore::ResourceError downloadDestinationError(const WebCore::ResourceResponse&, const WTF::String&);
+#endif
+
+#if PLATFORM(GTK)
+WebCore::ResourceError printError(const WebCore::URL&, const WTF::String&);
+WebCore::ResourceError printerNotFoundError(const WebCore::URL&);
+WebCore::ResourceError invalidPageRangeToPrint(const WebCore::URL&);
+#endif
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedglibWebErrorsGlibcppfromrev214933trunkSourceWebKit2WebProcessWebCoreSupportgtkWebErrorsGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/glib/WebErrorsGlib.cpp (from rev 214933, trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/glib/WebErrorsGlib.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/glib/WebErrorsGlib.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * 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 "WebErrors.h"
+
+#include "APIError.h"
+#include <WebCore/LocalizedStrings.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ResourceError cancelledError(const ResourceRequest& request)
+{
+ return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::Cancelled, request.url(), WEB_UI_STRING("Load request cancelled", "Load request cancelled"));
+}
+
+ResourceError fileDoesNotExistError(const ResourceResponse& response)
+{
+ return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::FileDoesNotExist, response.url(), WEB_UI_STRING("File does not exist", "The requested file doesn't exist"));
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebErrorsGtkcppfromrev214933trunkSourceWebKit2NetworkProcessDownloadsgtkDownloadSoupErrorsGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp (from rev 214933, trunk/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * 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 "WebErrors.h"
+
+#include "APIError.h"
+#include <WebCore/URL.h>
+#include <glib/gi18n-lib.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ResourceError printError(const URL& failingURL, const String& localizedDescription)
+{
+ return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::General, failingURL, localizedDescription);
+}
+
+ResourceError printerNotFoundError(const URL& failingURL)
+{
+ return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::PrinterNotFound, failingURL, _("Printer not found"));
+}
+
+ResourceError invalidPageRangeToPrint(const URL& failingURL)
+{
+ return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::InvalidPageRange, failingURL, _("Invalid page range"));
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupWebErrorsSoupcppfromrev214933trunkSourceWebKit2NetworkProcessDownloadsgtkDownloadSoupErrorsGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/soup/WebErrorsSoup.cpp (from rev 214933, trunk/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp) (0 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/WebErrorsSoup.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/soup/WebErrorsSoup.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * 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 "WebErrors.h"
+
+#include "APIError.h"
+#include <WebCore/LocalizedStrings.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceResponse.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ResourceError downloadNetworkError(const URL& failingURL, const String& localizedDescription)
+{
+ return ResourceError(API::Error::webKitDownloadErrorDomain(), API::Error::Download::Transport, failingURL, localizedDescription);
+}
+
+ResourceError downloadCancelledByUserError(const ResourceResponse& response)
+{
+ return ResourceError(API::Error::webKitDownloadErrorDomain(), API::Error::Download::CancelledByUser, response.url(), WEB_UI_STRING("User cancelled the download", "The download was cancelled by the user"));
+}
+
+ResourceError downloadDestinationError(const ResourceResponse& response, const String& localizedDescription)
+{
+ return ResourceError(API::Error::webKitDownloadErrorDomain(), API::Error::Download::Destination, response.url(), localizedDescription);
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> #include "WebKitDownload.h"
</span><span class="cx">
</span><span class="cx"> #include "DownloadProxy.h"
</span><ins>+#include "WebErrors.h"
</ins><span class="cx"> #include "WebKitDownloadPrivate.h"
</span><span class="cx"> #include "WebKitMarshal.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><del>-#include <WebCore/ErrorsGtk.h>
</del><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> #include "WebKitError.h"
</span><span class="cx">
</span><span class="cx"> #include "WebKitPrivate.h"
</span><del>-#include <WebCore/ErrorsGtk.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -37,27 +36,27 @@
</span><span class="cx">
</span><span class="cx"> GQuark webkit_network_error_quark()
</span><span class="cx"> {
</span><del>- return g_quark_from_static_string(WebCore::errorDomainNetwork);
</del><ins>+ return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitNetworkErrorDomain().characters8()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GQuark webkit_policy_error_quark()
</span><span class="cx"> {
</span><del>- return g_quark_from_static_string(WebCore::errorDomainPolicy);
</del><ins>+ return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPolicyErrorDomain().characters8()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GQuark webkit_plugin_error_quark()
</span><span class="cx"> {
</span><del>- return g_quark_from_static_string(WebCore::errorDomainPlugin);
</del><ins>+ return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPluginErrorDomain().characters8()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GQuark webkit_download_error_quark()
</span><span class="cx"> {
</span><del>- return g_quark_from_static_string(WebCore::errorDomainDownload);
</del><ins>+ return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitDownloadErrorDomain().characters8()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GQuark webkit_print_error_quark()
</span><span class="cx"> {
</span><del>- return g_quark_from_static_string(WebCore::errorDomainPrint);
</del><ins>+ return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPrintErrorDomain().characters8()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GQuark webkit_javascript_error_quark()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -20,7 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx">
</span><del>-#include "ErrorsGtk.h"
</del><ins>+#include "APIError.h"
+#include "WKErrorRef.h"
</ins><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebKitError.h"
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="lines">@@ -113,49 +114,39 @@
</span><span class="cx"> unsigned toWebKitError(unsigned webCoreError)
</span><span class="cx"> {
</span><span class="cx"> switch (webCoreError) {
</span><del>- case WebCore::NetworkErrorFailed:
- return WEBKIT_NETWORK_ERROR_FAILED;
- case WebCore::NetworkErrorTransport:
- return WEBKIT_NETWORK_ERROR_TRANSPORT;
- case WebCore::NetworkErrorUnknownProtocol:
- return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
- case WebCore::NetworkErrorCancelled:
</del><ins>+ case API::Error::Network::Cancelled:
</ins><span class="cx"> return WEBKIT_NETWORK_ERROR_CANCELLED;
</span><del>- case WebCore::NetworkErrorFileDoesNotExist:
</del><ins>+ case API::Error::Network::FileDoesNotExist:
</ins><span class="cx"> return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
</span><del>- case WebCore::PolicyErrorFailed:
- return WEBKIT_POLICY_ERROR_FAILED;
- case WebCore::PolicyErrorCannotShowMimeType:
</del><ins>+ case kWKErrorCodeCannotShowMIMEType:
</ins><span class="cx"> return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
</span><del>- case WebCore::PolicyErrorCannotShowURL:
</del><ins>+ case kWKErrorCodeCannotShowURL:
</ins><span class="cx"> return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
</span><del>- case WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange:
</del><ins>+ case kWKErrorCodeFrameLoadInterruptedByPolicyChange:
</ins><span class="cx"> return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
</span><del>- case WebCore::PolicyErrorCannotUseRestrictedPort:
</del><ins>+ case kWKErrorCodeCannotUseRestrictedPort:
</ins><span class="cx"> return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
</span><del>- case WebCore::PluginErrorFailed:
- return WEBKIT_PLUGIN_ERROR_FAILED;
- case WebCore::PluginErrorCannotFindPlugin:
</del><ins>+ case kWKErrorCodeCannotFindPlugIn:
</ins><span class="cx"> return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
</span><del>- case WebCore::PluginErrorCannotLoadPlugin:
</del><ins>+ case kWKErrorCodeCannotLoadPlugIn:
</ins><span class="cx"> return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
</span><del>- case WebCore::PluginErrorJavaUnavailable:
</del><ins>+ case kWKErrorCodeJavaUnavailable:
</ins><span class="cx"> return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
</span><del>- case WebCore::PluginErrorConnectionCancelled:
</del><ins>+ case kWKErrorCodePlugInCancelledConnection:
</ins><span class="cx"> return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
</span><del>- case WebCore::PluginErrorWillHandleLoad:
</del><ins>+ case kWKErrorCodePlugInWillHandleLoad:
</ins><span class="cx"> return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
</span><del>- case WebCore::DownloadErrorNetwork:
</del><ins>+ case API::Error::Download::Transport:
</ins><span class="cx"> return WEBKIT_DOWNLOAD_ERROR_NETWORK;
</span><del>- case WebCore::DownloadErrorCancelledByUser:
</del><ins>+ case API::Error::Download::CancelledByUser:
</ins><span class="cx"> return WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER;
</span><del>- case WebCore::DownloadErrorDestination:
</del><ins>+ case API::Error::Download::Destination:
</ins><span class="cx"> return WEBKIT_DOWNLOAD_ERROR_DESTINATION;
</span><del>- case WebCore::PrintErrorGeneral:
</del><ins>+ case API::Error::Print::General:
</ins><span class="cx"> return WEBKIT_PRINT_ERROR_GENERAL;
</span><del>- case WebCore::PrintErrorPrinterNotFound:
</del><ins>+ case API::Error::Print::PrinterNotFound:
</ins><span class="cx"> return WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND;
</span><del>- case WebCore::PrintErrorInvalidPageRange:
</del><ins>+ case API::Error::Print::InvalidPageRange:
</ins><span class="cx"> return WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE;
</span><span class="cx"> default:
</span><span class="cx"> // This may be a user app defined error, which needs to be passed as-is.
</span><span class="lines">@@ -166,50 +157,40 @@
</span><span class="cx"> unsigned toWebCoreError(unsigned webKitError)
</span><span class="cx"> {
</span><span class="cx"> switch (webKitError) {
</span><del>- case WEBKIT_NETWORK_ERROR_FAILED:
- return WebCore::NetworkErrorFailed;
- case WEBKIT_NETWORK_ERROR_TRANSPORT:
- return WebCore::NetworkErrorTransport;
- case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
- return WebCore::NetworkErrorUnknownProtocol;
</del><span class="cx"> case WEBKIT_NETWORK_ERROR_CANCELLED:
</span><del>- return WebCore::NetworkErrorCancelled;
</del><ins>+ return API::Error::Network::Cancelled;
</ins><span class="cx"> case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
</span><del>- return WebCore::NetworkErrorFileDoesNotExist;
- case WEBKIT_POLICY_ERROR_FAILED:
- return WebCore::PolicyErrorFailed;
</del><ins>+ return API::Error::Network::FileDoesNotExist;
</ins><span class="cx"> case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
</span><del>- return WebCore::PolicyErrorCannotShowMimeType;
</del><ins>+ return kWKErrorCodeCannotShowMIMEType;
</ins><span class="cx"> case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
</span><del>- return WebCore::PolicyErrorCannotShowURL;
</del><ins>+ return kWKErrorCodeCannotShowURL;
</ins><span class="cx"> case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
</span><del>- return WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange;
</del><ins>+ return kWKErrorCodeFrameLoadInterruptedByPolicyChange;
</ins><span class="cx"> case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
</span><del>- return WebCore::PolicyErrorCannotUseRestrictedPort;
- case WEBKIT_PLUGIN_ERROR_FAILED:
- return WebCore::PluginErrorFailed;
</del><ins>+ return kWKErrorCodeCannotUseRestrictedPort;
</ins><span class="cx"> case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
</span><del>- return WebCore::PluginErrorCannotFindPlugin;
</del><ins>+ return kWKErrorCodeCannotFindPlugIn;
</ins><span class="cx"> case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
</span><del>- return WebCore::PluginErrorCannotLoadPlugin;
</del><ins>+ return kWKErrorCodeCannotLoadPlugIn;
</ins><span class="cx"> case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
</span><del>- return WebCore::PluginErrorJavaUnavailable;
</del><ins>+ return kWKErrorCodeJavaUnavailable;
</ins><span class="cx"> case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
</span><del>- return WebCore::PluginErrorConnectionCancelled;
</del><ins>+ return kWKErrorCodePlugInCancelledConnection;
</ins><span class="cx"> case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
</span><del>- return WebCore::PluginErrorWillHandleLoad;
</del><ins>+ return kWKErrorCodePlugInWillHandleLoad;
</ins><span class="cx"> case WEBKIT_DOWNLOAD_ERROR_NETWORK:
</span><del>- return WebCore::DownloadErrorNetwork;
</del><ins>+ return API::Error::Download::Transport;
</ins><span class="cx"> case WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER:
</span><del>- return WebCore::DownloadErrorCancelledByUser;
</del><ins>+ return API::Error::Download::CancelledByUser;
</ins><span class="cx"> case WEBKIT_DOWNLOAD_ERROR_DESTINATION:
</span><del>- return WebCore::DownloadErrorDestination;
</del><ins>+ return API::Error::Download::Destination;
</ins><span class="cx"> case WEBKIT_PRINT_ERROR_GENERAL:
</span><del>- return WebCore::PrintErrorGeneral;
</del><ins>+ return API::Error::Print::General;
</ins><span class="cx"> case WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND:
</span><del>- return WebCore::PrintErrorPrinterNotFound;
</del><ins>+ return API::Error::Print::PrinterNotFound;
</ins><span class="cx"> case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:
</span><del>- return WebCore::PrintErrorInvalidPageRange;
</del><ins>+ return API::Error::Print::InvalidPageRange;
</ins><span class="cx"> default:
</span><span class="cx"> // This may be a user app defined error, which needs to be passed as-is.
</span><span class="cx"> return webKitError;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -226,7 +226,6 @@
</span><span class="cx"> 1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */; };
</span><span class="cx"> 1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
</span><span class="cx"> 1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
</del><span class="cx"> 1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */; };
</span><span class="cx"> 1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445B9E184D5FB5004B3414 /* WKContextInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1203,6 +1202,9 @@
</span><span class="cx"> 7A821F4C1E2F673900604577 /* LegacyCustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4B1E2F664800604577 /* LegacyCustomProtocolManagerClient.h */; };
</span><span class="cx"> 7A821F4E1E2F67A800604577 /* LegacyCustomProtocolManagerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F4D1E2F679E00604577 /* LegacyCustomProtocolManagerClient.mm */; };
</span><span class="cx"> 7A821F501E2F7A7500604577 /* APICustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */; };
</span><ins>+ 7AF236201E79A3E400438A05 /* WebErrors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF2361E1E79A3B400438A05 /* WebErrors.cpp */; };
+ 7AF236211E79A40800438A05 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF2361F1E79A3D800438A05 /* WebErrors.h */; };
+ 7AF236231E79A44400438A05 /* WebErrorsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */; };
</ins><span class="cx"> 7C065F2B1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */; };
</span><span class="cx"> 7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
</span><span class="cx"> 7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */; };
</span><span class="lines">@@ -1528,7 +1530,6 @@
</span><span class="cx"> BC111A5F112F4FBB00337BAB /* WebFrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111A58112F4FBB00337BAB /* WebFrameLoaderClient.cpp */; };
</span><span class="cx"> BC111A60112F4FBB00337BAB /* WebInspectorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111A59112F4FBB00337BAB /* WebInspectorClient.cpp */; };
</span><span class="cx"> BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111ADC112F5B9300337BAB /* WebFrame.cpp */; };
</span><del>- BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */; };
</del><span class="cx"> BC111AE4112F5C2600337BAB /* WebProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111AE3112F5C2600337BAB /* WebProcess.cpp */; };
</span><span class="cx"> BC111B09112F5E3C00337BAB /* ResponsivenessTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */; };
</span><span class="cx"> BC111B0E112F5E4F00337BAB /* WebFrameProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111B0A112F5E4F00337BAB /* WebFrameProxy.cpp */; };
</span><span class="lines">@@ -2375,7 +2376,6 @@
</span><span class="cx"> 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiverMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiver.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHistoryDelegatePrivate.h; sourceTree = "<group>"; };
</span><del>- 1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKProcessPoolConfiguration.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKProcessPoolConfiguration.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A445B9E184D5FB5004B3414 /* WKContextInjectedBundleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextInjectedBundleClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3467,6 +3467,9 @@
</span><span class="cx"> 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadStatisticsStore.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7A9CD8C11C77984900D9F6C7 /* WebResourceLoadStatisticsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 7A9CD8C21C779AD600D9F6C7 /* WebResourceLoadStatisticsStore.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebResourceLoadStatisticsStore.messages.in; sourceTree = "<group>"; };
</span><ins>+ 7AF2361E1E79A3B400438A05 /* WebErrors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebErrors.cpp; sourceTree = "<group>"; };
+ 7AF2361F1E79A3D800438A05 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
+ 7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebErrorsCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebUserContentControllerDataTypes.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentControllerDataTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WebContent-iOS.entitlements"; sourceTree = "<group>"; };
</span><span class="lines">@@ -3813,7 +3816,6 @@
</span><span class="cx"> BC111A58112F4FBB00337BAB /* WebFrameLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFrameLoaderClient.cpp; sourceTree = "<group>"; wrapsLines = 0; };
</span><span class="cx"> BC111A59112F4FBB00337BAB /* WebInspectorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC111ADC112F5B9300337BAB /* WebFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFrame.cpp; sourceTree = "<group>"; };
</span><del>- BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebErrorsMac.mm; sourceTree = "<group>"; };
</del><span class="cx"> BC111AE3112F5C2600337BAB /* WebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcess.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC111B0A112F5E4F00337BAB /* WebFrameProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFrameProxy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4946,6 +4948,8 @@
</span><span class="cx"> 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */,
</span><span class="cx"> 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */,
</span><span class="cx"> BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
</span><ins>+ 7AF2361E1E79A3B400438A05 /* WebErrors.cpp */,
+ 7AF2361F1E79A3D800438A05 /* WebErrors.h */,
</ins><span class="cx"> C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
</span><span class="cx"> BC032DAF10F4380F0058C15A /* WebEvent.h */,
</span><span class="cx"> BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
</span><span class="lines">@@ -5711,6 +5715,7 @@
</span><span class="cx"> 37BF2F051947DEB400723C48 /* WKNSURLRequest.mm */,
</span><span class="cx"> 378E1A3F181EDA010031007A /* WKObject.h */,
</span><span class="cx"> 374436871820E7240049579F /* WKObject.mm */,
</span><ins>+ 7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */,
</ins><span class="cx"> );
</span><span class="cx"> name = cocoa;
</span><span class="cx"> path = Cocoa;
</span><span class="lines">@@ -6519,7 +6524,6 @@
</span><span class="cx"> BC032D6610F4378D0058C15A /* WebDragClient.h */,
</span><span class="cx"> BC111A57112F4FBB00337BAB /* WebEditorClient.cpp */,
</span><span class="cx"> BC032D6810F4378D0058C15A /* WebEditorClient.h */,
</span><del>- 1A433F0C113C53DD00FACDE9 /* WebErrors.h */,
</del><span class="cx"> BC111A58112F4FBB00337BAB /* WebFrameLoaderClient.cpp */,
</span><span class="cx"> BC032D6A10F4378D0058C15A /* WebFrameLoaderClient.h */,
</span><span class="cx"> BC1BE1DF12D54A410004A228 /* WebGeolocationClient.cpp */,
</span><span class="lines">@@ -7012,7 +7016,6 @@
</span><span class="cx"> 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */,
</span><span class="cx"> C554FFA212E4E8EA002F22C0 /* WebDragClientMac.mm */,
</span><span class="cx"> C5237F5F12441CA300780472 /* WebEditorClientMac.mm */,
</span><del>- BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */,
</del><span class="cx"> 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */,
</span><span class="cx"> 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */,
</span><span class="cx"> BCC43AC6127B99DE00317F16 /* WebPopupMenuMac.mm */,
</span><span class="lines">@@ -8576,7 +8579,6 @@
</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>- 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */,
</del><span class="cx"> BC032DB910F4380F0058C15A /* WebEvent.h in Headers */,
</span><span class="cx"> BC032DBB10F4380F0058C15A /* WebEventConversion.h in Headers */,
</span><span class="cx"> BC111B5D112F629800337BAB /* WebEventFactory.h in Headers */,
</span><span class="lines">@@ -9009,6 +9011,7 @@
</span><span class="cx"> 7C2413091AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h in Headers */,
</span><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
</span><span class="cx"> F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
</span><ins>+ 7AF236211E79A40800438A05 /* WebErrors.h in Headers */,
</ins><span class="cx"> 07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */,
</span><span class="cx"> 4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */,
</span><span class="cx"> 1AAF089B19267EE500B6390C /* WKUserScript.h in Headers */,
</span><span class="lines">@@ -10154,7 +10157,6 @@
</span><span class="cx"> BC111A5E112F4FBB00337BAB /* WebEditorClient.cpp in Sources */,
</span><span class="cx"> 2D28F3E61885CCC1004B9EAE /* WebEditorClientIOS.mm in Sources */,
</span><span class="cx"> C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */,
</span><del>- BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
</del><span class="cx"> C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
</span><span class="cx"> BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
</span><span class="cx"> BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
</span><span class="lines">@@ -10171,6 +10173,7 @@
</span><span class="cx"> CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */,
</span><span class="cx"> CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */,
</span><ins>+ 7AF236231E79A44400438A05 /* WebErrorsCocoa.mm in Sources */,
</ins><span class="cx"> 515BE1AA1D555A9B00DD7C68 /* WebGamepad.cpp in Sources */,
</span><span class="cx"> 515BE1771D53FE8700DD7C68 /* WebGamepadProvider.cpp in Sources */,
</span><span class="cx"> BC1BE1E112D54A410004A228 /* WebGeolocationClient.cpp in Sources */,
</span><span class="lines">@@ -10515,6 +10518,7 @@
</span><span class="cx"> BC407609124FF0270068F20A /* WKURL.cpp in Sources */,
</span><span class="cx"> BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */,
</span><span class="cx"> BC40760B124FF0270068F20A /* WKURLRequest.cpp in Sources */,
</span><ins>+ 7AF236201E79A3E400438A05 /* WebErrors.cpp in Sources */,
</ins><span class="cx"> BC40762A124FF0400068F20A /* WKURLRequestNS.mm in Sources */,
</span><span class="cx"> BC40760D124FF0270068F20A /* WKURLResponse.cpp in Sources */,
</span><span class="cx"> BC40762C124FF0400068F20A /* WKURLResponseNS.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebErrorsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010-2016 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.
- */
-
-#pragma once
-
-namespace WebCore {
- class URL;
- class ResourceError;
- class ResourceRequest;
- class ResourceResponse;
-}
-
-namespace WebKit {
-
-WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
-WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
-WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&);
-WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
-WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
-#if ENABLE(CONTENT_FILTERING)
-WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&);
-#endif
-WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
-WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
-WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
-WebCore::ResourceError internalError(const WebCore::URL&);
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebErrorsGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- * Copyright (C) 2011 Igalia S.L.
- *
- * 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 "WebErrors.h"
-
-#include "APIError.h"
-#include <WebCore/ErrorsGtk.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/ResourceResponse.h>
-#include <WebKit/WKErrorRef.h>
-#include <glib/gi18n-lib.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-ResourceError cancelledError(const ResourceRequest& request)
-{
- return WebCore::cancelledError(request);
-}
-
-ResourceError blockedError(const ResourceRequest& request)
-{
- return WebCore::blockedError(request);
-}
-
-ResourceError blockedByContentBlockerError(const ResourceRequest& request)
-{
- return WebCore::blockedByContentBlockerError(request);
-}
-
-ResourceError cannotShowURLError(const ResourceRequest& request)
-{
- return WebCore::cannotShowURLError(request);
-}
-
-ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
-{
- return WebCore::interruptedForPolicyChangeError(request);
-}
-
-ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
-{
- return WebCore::cannotShowMIMETypeError(response);
-}
-
-ResourceError fileDoesNotExistError(const ResourceResponse& response)
-{
- return WebCore::fileDoesNotExistError(response);
-}
-
-ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
-{
- return WebCore::pluginWillHandleLoadError(response);
-}
-
-WebCore::ResourceError internalError(const WebCore::URL& url)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, _("Internal error"));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -1,107 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010-2016 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 "WebErrors.h"
-
-#import "APIError.h"
-#import "WKErrorRef.h"
-#import <WebCore/LocalizedStrings.h>
-#import <WebCore/ResourceRequest.h>
-#import <WebCore/ResourceResponse.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-namespace WebKit {
-
-static RetainPtr<NSError> createNSError(NSString* domain, int code, NSURL *URL)
-{
- NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
- URL, @"NSErrorFailingURLKey",
- [URL absoluteString], @"NSErrorFailingURLStringKey",
- nil];
-
- return adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:userInfo]);
-}
-
-// Use NSError's if available.
-
-ResourceError cancelledError(const ResourceRequest& request)
-{
- return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorCancelled, request.url()).get());
-}
-
-ResourceError fileDoesNotExistError(const ResourceResponse& response)
-{
- return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorFileDoesNotExist, response.url()).get());
-}
-
-
-// Otherwise, fallback to our own errors.
-
-ResourceError blockedError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
-}
-
-ResourceError blockedByContentBlockerError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
-}
-
-ResourceError cannotShowURLError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
-}
-
-ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
-}
-
-#if ENABLE(CONTENT_FILTERING)
-ResourceError blockedByContentFilterError(const ResourceRequest& request)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
-}
-#endif
-
-ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
-}
-
-ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
-}
-
-ResourceError internalError(const URL& url)
-{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (214933 => 214934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2017-04-05 07:39:35 UTC (rev 214933)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2017-04-05 07:41:53 UTC (rev 214934)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #include "WebPrintOperationGtk.h"
</span><span class="cx">
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebErrors.h"
</ins><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><del>-#include <WebCore/ErrorsGtk.h>
</del><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span></span></pre>
</div>
</div>
</body>
</html>