Changeset 214934 in webkit


Ignore:
Timestamp:
Apr 5, 2017 12:41:53 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

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:
Location:
trunk/Source
Files:
4 deleted
16 edited
4 copied
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r214932 r214934  
     12017-04-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=156974
     5
     6        Reviewed by Sam Weinig.
     7
     8        Remove ErrorsGtk.
     9
     10        * PlatformGTK.cmake:
     11        * platform/gtk/ErrorsGtk.cpp: Removed.
     12        * platform/gtk/ErrorsGtk.h: Removed.
     13
    1142017-04-05  Andy Estes  <aestes@apple.com>
    215

  • trunk/Source/WebCore/PlatformGTK.cmake

    r214538 r214934  
    140140
    141141    platform/gtk/DragDataGtk.cpp
    142     platform/gtk/ErrorsGtk.cpp
    143142    platform/gtk/LocalizedStringsGtk.cpp
    144143    platform/gtk/PasteboardGtk.cpp

  • trunk/Source/WebCore/platform/gtk/po/ChangeLog

    r214244 r214934  
     12017-04-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=156974
     5
     6        Reviewed by Sam Weinig.
     7
     8        * POTFILES.in: Add new paths with translatable strings.
     9
    1102017-03-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    211

  • trunk/Source/WebCore/platform/gtk/po/POTFILES.in

    r214244 r214934  
    11# List of source files which contain translatable strings.
    2 ErrorsGtk.cpp
    32LocalizedStringsGtk.cpp
    43../LocalizedStrings.cpp
     4../../../WebKit2/Shared/WebErrors.cpp
     5../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
     6../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
     7../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
    58../../../WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
    69../../../WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

  • trunk/Source/WebKit2/CMakeLists.txt

    r214658 r214934  
    190190    Shared/WebContextMenuItemData.cpp
    191191    Shared/WebCoreArgumentCoders.cpp
     192    Shared/WebErrors.cpp
    192193    Shared/WebEvent.cpp
    193194    Shared/WebEventConversion.cpp

  • trunk/Source/WebKit2/ChangeLog

    r214924 r214934  
     12017-04-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Move WebErrors from WebProcess to Shared and get rid of ErrorsGtk in WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=156974
     5
     6        Reviewed by Sam Weinig.
     7
     8        WebErrors are not only used by the frame loader client in the web process, but also by the network process. So,
     9        move them to Shared make most of the implementation cross-platform.
     10
     11        * CMakeLists.txt: Add new files to compilation.
     12        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
     13        (WebKit::NetworkDataTaskSoup::download): Use WebErrors directly instead of platform methods that are no longer needed.
     14        (WebKit::NetworkDataTaskSoup::writeDownloadCallback): Ditto.
     15        (WebKit::NetworkDataTaskSoup::didFinishDownload): Ditto.
     16        (WebKit::NetworkDataTaskSoup::didFail): Ditto.
     17        * PlatformGTK.cmake: Add new files to compilation and remove DownloadSoupErrorsGtk.cpp
     18        * PlatformMac.cmake:
     19        * Shared/API/APIError.cpp: Add error domains used by glib based ports.
     20        (API::Error::webKitNetworkErrorDomain):
     21        (API::Error::webKitPolicyErrorDomain):
     22        (API::Error::webKitPluginErrorDomain):
     23        (API::Error::webKitDownloadErrorDomain):
     24        (API::Error::webKitPrintErrorDomain):
     25        * Shared/API/APIError.h:
     26        * Shared/Cocoa/WebErrorsCocoa.mm: Copied from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
     27        (WebKit::createNSError):
     28        (WebKit::cancelledError):
     29        (WebKit::fileDoesNotExistError):
     30        * Shared/WebErrors.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
     31        (WebKit::blockedError):
     32        (WebKit::blockedByContentBlockerError):
     33        (WebKit::cannotShowURLError):
     34        (WebKit::interruptedForPolicyChangeError):
     35        (WebKit::blockedByContentFilterError):
     36        (WebKit::cannotShowMIMETypeError):
     37        (WebKit::pluginWillHandleLoadError):
     38        (WebKit::internalError):
     39        * Shared/WebErrors.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h.
     40        * Shared/glib/WebErrorsGlib.cpp: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp.
     41        (WebKit::cancelledError):
     42        (WebKit::fileDoesNotExistError):
     43        * Shared/gtk/WebErrorsGtk.cpp: Copied from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
     44        (WebKit::printError):
     45        (WebKit::printerNotFoundError):
     46        (WebKit::invalidPageRangeToPrint):
     47        * Shared/soup/WebErrorsSoup.cpp: Renamed from Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp.
     48        (WebKit::downloadNetworkError):
     49        (WebKit::downloadCancelledByUserError):
     50        (WebKit::downloadDestinationError):
     51        * UIProcess/API/gtk/WebKitDownload.cpp:
     52        * UIProcess/API/gtk/WebKitError.cpp:
     53        (webkit_network_error_quark):
     54        (webkit_policy_error_quark):
     55        (webkit_plugin_error_quark):
     56        (webkit_download_error_quark):
     57        (webkit_print_error_quark):
     58        * UIProcess/API/gtk/WebKitPrivate.cpp:
     59        (toWebKitError):
     60        (toWebCoreError):
     61        * WebKit2.xcodeproj/project.pbxproj:
     62        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm: Removed.
     63        * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
     64
    1652017-04-04  Youenn Fablet  <youenn@apple.com>
    266

  • trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp

    r214807 r214934  
    870870
    871871    if (m_response.httpStatusCode() >= 400) {
    872         didFailDownload(platformDownloadNetworkError(m_response.httpStatusCode(), m_response.url(), m_response.httpStatusText()));
     872        didFailDownload(downloadNetworkError(m_response.url(), m_response.httpStatusText()));
    873873        return;
    874874    }
    … …  
    885885        outputStream = adoptGRef(g_file_create(m_downloadDestinationFile.get(), G_FILE_CREATE_NONE, nullptr, &error.outPtr()));
    886886    if (!outputStream) {
    887         didFailDownload(platformDownloadDestinationError(m_response, error->message));
     887        didFailDownload(downloadDestinationError(m_response, error->message));
    888888        return;
    889889    }
    … …  
    894894    outputStream = adoptGRef(g_file_replace(m_downloadIntermediateFile.get(), 0, TRUE, G_FILE_CREATE_NONE, 0, &error.outPtr()));
    895895    if (!outputStream) {
    896         didFailDownload(platformDownloadDestinationError(m_response, error->message));
     896        didFailDownload(downloadDestinationError(m_response, error->message));
    897897        return;
    898898    }
    … …  
    928928#endif
    929929    if (error)
    930         task->didFailDownload(platformDownloadDestinationError(task->m_response, error->message));
     930        task->didFailDownload(downloadDestinationError(task->m_response, error->message));
    931931    else
    932932        task->didWriteDownload(bytesWritten);
    … …  
    983983    GUniqueOutPtr<GError> error;
    984984    if (!g_file_move(m_downloadIntermediateFile.get(), m_downloadDestinationFile.get(), G_FILE_COPY_OVERWRITE, m_cancellable.get(), nullptr, nullptr, &error.outPtr())) {
    985         didFailDownload(platformDownloadDestinationError(m_response, error->message));
     985        didFailDownload(downloadDestinationError(m_response, error->message));
    986986        return;
    987987    }
    … …  
    10271027{
    10281028    if (isDownload()) {
    1029         didFailDownload(platformDownloadNetworkError(error.errorCode(), error.failingURL(), error.localizedDescription()));
     1029        didFailDownload(downloadNetworkError(error.failingURL(), error.localizedDescription()));
    10301030        return;
    10311031    }

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r214215 r214934  
    3131    NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
    3232
    33     NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
    34 
    3533    NetworkProcess/cache/NetworkCacheCodersSoup.cpp
    3634    NetworkProcess/cache/NetworkCacheDataSoup.cpp
    … …  
    7573
    7674    Shared/cairo/ShareableBitmapCairo.cpp
     75
     76    Shared/glib/WebErrorsGlib.cpp
    7777
    7878    Shared/gtk/ArgumentCodersGtk.cpp
    … …  
    8484    Shared/gtk/ProcessExecutablePathGtk.cpp
    8585    Shared/gtk/WebContextMenuItemGtk.cpp
     86    Shared/gtk/WebErrorsGtk.cpp
    8687    Shared/gtk/WebEventFactory.cpp
    8788    Shared/gtk/WebSelectionData.cpp
    … …  
    9091
    9192    Shared/soup/WebCoreArgumentCodersSoup.cpp
     93    Shared/soup/WebErrorsSoup.cpp
    9294
    9395    Shared/unix/ChildProcessMain.cpp
    … …  
    476478    WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
    477479    WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
    478     WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
    479480    WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
    480481

  • trunk/Source/WebKit2/PlatformMac.cmake

    r214032 r214934  
    117117    Shared/Cocoa/WKNSURLRequest.mm
    118118    Shared/Cocoa/WKObject.mm
     119    Shared/Cocoa/WebErrorsCocoa.mm
    119120
    120121    Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
    … …  
    356357    WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
    357358    WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
    358     WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
    359359    WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
    360360    WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm

  • trunk/Source/WebKit2/Shared/API/APIError.cpp

    r204668 r214934  
    3939}
    4040
     41const WTF::String& Error::webKitNetworkErrorDomain()
     42{
     43#if USE(GLIB)
     44    static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitNetworkError"));
     45    return webKitErrorDomainString;
     46#else
     47    return webKitErrorDomain();
     48#endif
     49}
     50
     51const WTF::String& Error::webKitPolicyErrorDomain()
     52{
     53#if USE(GLIB)
     54    static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPolicyError"));
     55    return webKitErrorDomainString;
     56#else
     57    return webKitErrorDomain();
     58#endif
     59}
     60
     61const WTF::String& Error::webKitPluginErrorDomain()
     62{
     63#if USE(GLIB)
     64    static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPluginError"));
     65    return webKitErrorDomainString;
     66#else
     67    return webKitErrorDomain();
     68#endif
     69}
     70
     71#if USE(SOUP)
     72const WTF::String& Error::webKitDownloadErrorDomain()
     73{
     74    static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitDownloadError"));
     75    return webKitErrorDomainString;
     76}
     77#endif
     78
     79#if PLATFORM(GTK)
     80const WTF::String& Error::webKitPrintErrorDomain()
     81{
     82    static NeverDestroyed<WTF::String> webKitErrorDomainString(ASCIILiteral("WebKitPrintError"));
     83    return webKitErrorDomainString;
     84}
     85#endif
     86
    4187void Error::encode(IPC::Encoder& encoder) const
    4288{

  • trunk/Source/WebKit2/Shared/API/APIError.h

    r204668 r214934  
    5050
    5151    static const WTF::String& webKitErrorDomain();
     52    enum Network { Cancelled = 302, FileDoesNotExist = 303 };
     53    static const WTF::String& webKitNetworkErrorDomain();
     54    static const WTF::String& webKitPolicyErrorDomain();
     55    static const WTF::String& webKitPluginErrorDomain();
     56#if USE(SOUP)
     57    enum Download { Transport = 499, CancelledByUser = 400, Destination = 401 };
     58    static const WTF::String& webKitDownloadErrorDomain();
     59#endif
     60#if PLATFORM(GTK)
     61    enum Print { General = 599, PrinterNotFound = 500, InvalidPageRange = 501 };
     62    static const WTF::String& webKitPrintErrorDomain();
     63#endif
     64
    5265
    5366    const WTF::String& domain() const { return m_platformError.domain(); }

  • trunk/Source/WebKit2/Shared/Cocoa/WebErrorsCocoa.mm

    r214933 r214934  
    2424 */
    2525
    26 #pragma once
     26#import "config.h"
     27#import "WebErrors.h"
    2728
    28 namespace WebCore {
    29     class URL;
    30     class ResourceError;
    31     class ResourceRequest;
    32     class ResourceResponse;
    33 }
     29#import "APIError.h"
     30#import "WKErrorRef.h"
     31#import <WebCore/LocalizedStrings.h>
     32#import <WebCore/ResourceRequest.h>
     33#import <WebCore/ResourceResponse.h>
     34
     35using namespace WebCore;
     36using namespace WebKit;
    3437
    3538namespace WebKit {
    3639
    37 WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
    38 WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    39 WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&);
    40 WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    41 WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    42 #if ENABLE(CONTENT_FILTERING)
    43 WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&);
    44 #endif
    45 WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
    46 WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
    47 WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
    48 WebCore::ResourceError internalError(const WebCore::URL&);
     40static RetainPtr<NSError> createNSError(NSString* domain, int code, NSURL *URL)
     41{
     42    NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
     43        URL, @"NSErrorFailingURLKey",
     44        [URL absoluteString], @"NSErrorFailingURLStringKey",
     45        nil];
     46
     47    return adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:userInfo]);
     48}
     49
     50ResourceError cancelledError(const ResourceRequest& request)
     51{
     52    return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorCancelled, request.url()).get());
     53}
     54
     55ResourceError fileDoesNotExistError(const ResourceResponse& response)
     56{
     57    return ResourceError(createNSError(NSURLErrorDomain, NSURLErrorFileDoesNotExist, response.url()).get());
     58}
    4959
    5060} // namespace WebKit

  • trunk/Source/WebKit2/Shared/WebErrors.cpp

    r214933 r214934  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
    3  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
    4  * Copyright (C) 2011 Igalia S.L.
     2 * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
    53 *
    64 * Redistribution and use in source and binary forms, with or without
    … …  
    3028
    3129#include "APIError.h"
    32 #include <WebCore/ErrorsGtk.h>
    33 #include <WebCore/ResourceError.h>
     30#include "WKErrorRef.h"
     31#include <WebCore/LocalizedStrings.h>
    3432#include <WebCore/ResourceRequest.h>
    3533#include <WebCore/ResourceResponse.h>
    36 #include <WebKit/WKErrorRef.h>
    37 #include <glib/gi18n-lib.h>
    3834
    3935using namespace WebCore;
    … …  
    4137namespace WebKit {
    4238
    43 ResourceError cancelledError(const ResourceRequest& request)
    44 {
    45     return WebCore::cancelledError(request);
    46 }
    47 
    4839ResourceError blockedError(const ResourceRequest& request)
    4940{
    50     return WebCore::blockedError(request);
     41    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
    5142}
    5243
    5344ResourceError blockedByContentBlockerError(const ResourceRequest& request)
    5445{
    55     return WebCore::blockedByContentBlockerError(request);
     46    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
    5647}
    5748
    5849ResourceError cannotShowURLError(const ResourceRequest& request)
    5950{
    60     return WebCore::cannotShowURLError(request);
     51    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
    6152}
    6253
    6354ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    6455{
    65     return WebCore::interruptedForPolicyChangeError(request);
     56    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
    6657}
     58
     59#if ENABLE(CONTENT_FILTERING)
     60ResourceError blockedByContentFilterError(const ResourceRequest& request)
     61{
     62    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
     63}
     64#endif
    6765
    6866ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    6967{
    70     return WebCore::cannotShowMIMETypeError(response);
    71 }
    72 
    73 ResourceError fileDoesNotExistError(const ResourceResponse& response)
    74 {
    75     return WebCore::fileDoesNotExistError(response);
     68    return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
    7669}
    7770
    7871ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    7972{
    80     return WebCore::pluginWillHandleLoadError(response);
     73    return ResourceError(API::Error::webKitPluginErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
    8174}
    8275
    83 WebCore::ResourceError internalError(const WebCore::URL& url)
     76ResourceError internalError(const URL& url)
    8477{
    85     return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, _("Internal error"));
     78    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
    8679}
    8780

  • trunk/Source/WebKit2/Shared/WebErrors.h

    r214933 r214934  
    2626#pragma once
    2727
     28#include <wtf/Forward.h>
     29
    2830namespace WebCore {
    29     class URL;
    30     class ResourceError;
    31     class ResourceRequest;
    32     class ResourceResponse;
     31class URL;
     32class ResourceError;
     33class ResourceRequest;
     34class ResourceResponse;
    3335}
    3436
    … …  
    4850WebCore::ResourceError internalError(const WebCore::URL&);
    4951
     52#if USE(SOUP)
     53WebCore::ResourceError downloadNetworkError(const WebCore::URL&, const WTF::String&);
     54WebCore::ResourceError downloadCancelledByUserError(const WebCore::ResourceResponse&);
     55WebCore::ResourceError downloadDestinationError(const WebCore::ResourceResponse&, const WTF::String&);
     56#endif
     57
     58#if PLATFORM(GTK)
     59WebCore::ResourceError printError(const WebCore::URL&, const WTF::String&);
     60WebCore::ResourceError printerNotFoundError(const WebCore::URL&);
     61WebCore::ResourceError invalidPageRangeToPrint(const WebCore::URL&);
     62#endif
     63
    5064} // namespace WebKit

  • trunk/Source/WebKit2/Shared/glib/WebErrorsGlib.cpp

    r214933 r214934  
    3030
    3131#include "APIError.h"
    32 #include <WebCore/ErrorsGtk.h>
     32#include <WebCore/LocalizedStrings.h>
    3333#include <WebCore/ResourceError.h>
    3434#include <WebCore/ResourceRequest.h>
    3535#include <WebCore/ResourceResponse.h>
    36 #include <WebKit/WKErrorRef.h>
    37 #include <glib/gi18n-lib.h>
    3836
    3937using namespace WebCore;
    … …  
    4341ResourceError cancelledError(const ResourceRequest& request)
    4442{
    45     return WebCore::cancelledError(request);
    46 }
    47 
    48 ResourceError blockedError(const ResourceRequest& request)
    49 {
    50     return WebCore::blockedError(request);
    51 }
    52 
    53 ResourceError blockedByContentBlockerError(const ResourceRequest& request)
    54 {
    55     return WebCore::blockedByContentBlockerError(request);
    56 }
    57 
    58 ResourceError cannotShowURLError(const ResourceRequest& request)
    59 {
    60     return WebCore::cannotShowURLError(request);
    61 }
    62 
    63 ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    64 {
    65     return WebCore::interruptedForPolicyChangeError(request);
    66 }
    67 
    68 ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    69 {
    70     return WebCore::cannotShowMIMETypeError(response);
     43    return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::Cancelled, request.url(), WEB_UI_STRING("Load request cancelled", "Load request cancelled"));
    7144}
    7245
    7346ResourceError fileDoesNotExistError(const ResourceResponse& response)
    7447{
    75     return WebCore::fileDoesNotExistError(response);
    76 }
    77 
    78 ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    79 {
    80     return WebCore::pluginWillHandleLoadError(response);
    81 }
    82 
    83 WebCore::ResourceError internalError(const WebCore::URL& url)
    84 {
    85     return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, _("Internal error"));
     48    return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::FileDoesNotExist, response.url(), WEB_UI_STRING("File does not exist", "The requested file doesn't exist"));
    8649}
    8750

  • trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp

    r214933 r214934  
    11/*
    2  * Copyright (C) 2012 Intel Corporation. All rights reserved.
     2 * Copyright (C) 2017 Igalia S.L.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2525
    2626#include "config.h"
    27 #include "DownloadSoupErrors.h"
     27#include "WebErrors.h"
    2828
    29 #include <WebCore/ErrorsGtk.h>
    30 #include <WebCore/ResourceError.h>
     29#include "APIError.h"
     30#include <WebCore/URL.h>
     31#include <glib/gi18n-lib.h>
    3132
    3233using namespace WebCore;
    … …  
    3435namespace WebKit {
    3536
    36 ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
     37ResourceError printError(const URL& failingURL, const String& localizedDescription)
    3738{
    38     return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));
     39    return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::General, failingURL, localizedDescription);
    3940}
    4041
    41 ResourceError platformDownloadDestinationError(const ResourceResponse& response, const String& message)
     42ResourceError printerNotFoundError(const URL& failingURL)
    4243{
    43     return downloadDestinationError(response, message);
     44    return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::PrinterNotFound, failingURL, _("Printer not found"));
     45}
     46
     47ResourceError invalidPageRangeToPrint(const URL& failingURL)
     48{
     49    return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::InvalidPageRange, failingURL, _("Invalid page range"));
    4450}
    4551

  • trunk/Source/WebKit2/Shared/soup/WebErrorsSoup.cpp

    r214933 r214934  
    11/*
    2  * Copyright (C) 2012 Intel Corporation. All rights reserved.
     2 * Copyright (C) 2017 Igalia S.L.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2525
    2626#include "config.h"
    27 #include "DownloadSoupErrors.h"
     27#include "WebErrors.h"
    2828
    29 #include <WebCore/ErrorsGtk.h>
     29#include "APIError.h"
     30#include <WebCore/LocalizedStrings.h>
    3031#include <WebCore/ResourceError.h>
     32#include <WebCore/ResourceResponse.h>
    3133
    3234using namespace WebCore;
    … …  
    3436namespace WebKit {
    3537
    36 ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
     38ResourceError downloadNetworkError(const URL& failingURL, const String& localizedDescription)
    3739{
    38     return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));
     40    return ResourceError(API::Error::webKitDownloadErrorDomain(), API::Error::Download::Transport, failingURL, localizedDescription);
    3941}
    4042
    41 ResourceError platformDownloadDestinationError(const ResourceResponse& response, const String& message)
     43ResourceError downloadCancelledByUserError(const ResourceResponse& response)
    4244{
    43     return downloadDestinationError(response, message);
     45    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"));
     46}
     47
     48ResourceError downloadDestinationError(const ResourceResponse& response, const String& localizedDescription)
     49{
     50    return ResourceError(API::Error::webKitDownloadErrorDomain(), API::Error::Download::Destination, response.url(), localizedDescription);
    4451}
    4552

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

    r213703 r214934  
    2222
    2323#include "DownloadProxy.h"
     24#include "WebErrors.h"
    2425#include "WebKitDownloadPrivate.h"
    2526#include "WebKitMarshal.h"
    … …  
    2728#include "WebKitURIRequestPrivate.h"
    2829#include "WebKitURIResponsePrivate.h"
    29 #include <WebCore/ErrorsGtk.h>
    3030#include <WebCore/ResourceResponse.h>
    3131#include <glib/gi18n-lib.h>

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp

    r164438 r214934  
    2323
    2424#include "WebKitPrivate.h"
    25 #include <WebCore/ErrorsGtk.h>
    2625
    2726using namespace WebCore;
    … …  
    3837GQuark webkit_network_error_quark()
    3938{
    40     return g_quark_from_static_string(WebCore::errorDomainNetwork);
     39    return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitNetworkErrorDomain().characters8()));
    4140}
    4241
    4342GQuark webkit_policy_error_quark()
    4443{
    45     return g_quark_from_static_string(WebCore::errorDomainPolicy);
     44    return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPolicyErrorDomain().characters8()));
    4645}
    4746
    4847GQuark webkit_plugin_error_quark()
    4948{
    50     return g_quark_from_static_string(WebCore::errorDomainPlugin);
     49    return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPluginErrorDomain().characters8()));
    5150}
    5251
    5352GQuark webkit_download_error_quark()
    5453{
    55     return g_quark_from_static_string(WebCore::errorDomainDownload);
     54    return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitDownloadErrorDomain().characters8()));
    5655}
    5756
    5857GQuark webkit_print_error_quark()
    5958{
    60     return g_quark_from_static_string(WebCore::errorDomainPrint);
     59    return g_quark_from_static_string(reinterpret_cast<const char*>(API::Error::webKitPrintErrorDomain().characters8()));
    6160}
    6261

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp

    r212205 r214934  
    2121#include "WebKitPrivate.h"
    2222
    23 #include "ErrorsGtk.h"
     23#include "APIError.h"
     24#include "WKErrorRef.h"
    2425#include "WebEvent.h"
    2526#include "WebKitError.h"
    … …  
    114115{
    115116    switch (webCoreError) {
    116     case WebCore::NetworkErrorFailed:
    117         return WEBKIT_NETWORK_ERROR_FAILED;
    118     case WebCore::NetworkErrorTransport:
    119         return WEBKIT_NETWORK_ERROR_TRANSPORT;
    120     case WebCore::NetworkErrorUnknownProtocol:
    121         return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
    122     case WebCore::NetworkErrorCancelled:
     117    case API::Error::Network::Cancelled:
    123118        return WEBKIT_NETWORK_ERROR_CANCELLED;
    124     case WebCore::NetworkErrorFileDoesNotExist:
     119    case API::Error::Network::FileDoesNotExist:
    125120        return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
    126     case WebCore::PolicyErrorFailed:
    127         return WEBKIT_POLICY_ERROR_FAILED;
    128     case WebCore::PolicyErrorCannotShowMimeType:
     121    case kWKErrorCodeCannotShowMIMEType:
    129122        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
    130     case WebCore::PolicyErrorCannotShowURL:
     123    case kWKErrorCodeCannotShowURL:
    131124        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
    132     case WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange:
     125    case kWKErrorCodeFrameLoadInterruptedByPolicyChange:
    133126        return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
    134     case WebCore::PolicyErrorCannotUseRestrictedPort:
     127    case kWKErrorCodeCannotUseRestrictedPort:
    135128        return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
    136     case WebCore::PluginErrorFailed:
    137         return WEBKIT_PLUGIN_ERROR_FAILED;
    138     case WebCore::PluginErrorCannotFindPlugin:
     129    case kWKErrorCodeCannotFindPlugIn:
    139130        return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
    140     case WebCore::PluginErrorCannotLoadPlugin:
     131    case kWKErrorCodeCannotLoadPlugIn:
    141132        return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
    142     case WebCore::PluginErrorJavaUnavailable:
     133    case kWKErrorCodeJavaUnavailable:
    143134        return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
    144     case WebCore::PluginErrorConnectionCancelled:
     135    case kWKErrorCodePlugInCancelledConnection:
    145136        return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
    146     case WebCore::PluginErrorWillHandleLoad:
     137    case kWKErrorCodePlugInWillHandleLoad:
    147138        return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
    148     case WebCore::DownloadErrorNetwork:
     139    case API::Error::Download::Transport:
    149140        return WEBKIT_DOWNLOAD_ERROR_NETWORK;
    150     case WebCore::DownloadErrorCancelledByUser:
     141    case API::Error::Download::CancelledByUser:
    151142        return WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER;
    152     case WebCore::DownloadErrorDestination:
     143    case API::Error::Download::Destination:
    153144        return WEBKIT_DOWNLOAD_ERROR_DESTINATION;
    154     case WebCore::PrintErrorGeneral:
     145    case API::Error::Print::General:
    155146        return WEBKIT_PRINT_ERROR_GENERAL;
    156     case WebCore::PrintErrorPrinterNotFound:
     147    case API::Error::Print::PrinterNotFound:
    157148        return WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND;
    158     case WebCore::PrintErrorInvalidPageRange:
     149    case API::Error::Print::InvalidPageRange:
    159150        return WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE;
    160151    default:
    … …  
    167158{
    168159    switch (webKitError) {
    169     case WEBKIT_NETWORK_ERROR_FAILED:
    170         return WebCore::NetworkErrorFailed;
    171     case WEBKIT_NETWORK_ERROR_TRANSPORT:
    172         return WebCore::NetworkErrorTransport;
    173     case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
    174         return WebCore::NetworkErrorUnknownProtocol;
    175160    case WEBKIT_NETWORK_ERROR_CANCELLED:
    176         return WebCore::NetworkErrorCancelled;
     161        return API::Error::Network::Cancelled;
    177162    case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
    178         return WebCore::NetworkErrorFileDoesNotExist;
    179     case WEBKIT_POLICY_ERROR_FAILED:
    180         return WebCore::PolicyErrorFailed;
     163        return API::Error::Network::FileDoesNotExist;
    181164    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
    182         return WebCore::PolicyErrorCannotShowMimeType;
     165        return kWKErrorCodeCannotShowMIMEType;
    183166    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
    184         return WebCore::PolicyErrorCannotShowURL;
     167        return kWKErrorCodeCannotShowURL;
    185168    case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
    186         return WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange;
     169        return kWKErrorCodeFrameLoadInterruptedByPolicyChange;
    187170    case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
    188         return WebCore::PolicyErrorCannotUseRestrictedPort;
    189     case WEBKIT_PLUGIN_ERROR_FAILED:
    190         return WebCore::PluginErrorFailed;
     171        return kWKErrorCodeCannotUseRestrictedPort;
    191172    case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
    192         return WebCore::PluginErrorCannotFindPlugin;
     173        return kWKErrorCodeCannotFindPlugIn;
    193174    case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
    194         return WebCore::PluginErrorCannotLoadPlugin;
     175        return kWKErrorCodeCannotLoadPlugIn;
    195176    case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
    196         return WebCore::PluginErrorJavaUnavailable;
     177        return kWKErrorCodeJavaUnavailable;
    197178    case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
    198         return WebCore::PluginErrorConnectionCancelled;
     179        return kWKErrorCodePlugInCancelledConnection;
    199180    case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
    200         return WebCore::PluginErrorWillHandleLoad;
     181        return kWKErrorCodePlugInWillHandleLoad;
    201182    case WEBKIT_DOWNLOAD_ERROR_NETWORK:
    202         return WebCore::DownloadErrorNetwork;
     183        return API::Error::Download::Transport;
    203184    case WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER:
    204         return WebCore::DownloadErrorCancelledByUser;
     185        return API::Error::Download::CancelledByUser;
    205186    case WEBKIT_DOWNLOAD_ERROR_DESTINATION:
    206         return WebCore::DownloadErrorDestination;
     187        return API::Error::Download::Destination;
    207188    case WEBKIT_PRINT_ERROR_GENERAL:
    208         return WebCore::PrintErrorGeneral;
     189        return API::Error::Print::General;
    209190    case WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND:
    210         return WebCore::PrintErrorPrinterNotFound;
     191        return API::Error::Print::PrinterNotFound;
    211192    case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:
    212         return WebCore::PrintErrorInvalidPageRange;
     193        return API::Error::Print::InvalidPageRange;
    213194    default:
    214195        // This may be a user app defined error, which needs to be passed as-is.

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r214413 r214934  
    227227                1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
    228228                1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    229                 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
    230229                1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */; };
    231230                1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    12041203                7A821F4E1E2F67A800604577 /* LegacyCustomProtocolManagerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F4D1E2F679E00604577 /* LegacyCustomProtocolManagerClient.mm */; };
    12051204                7A821F501E2F7A7500604577 /* APICustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */; };
     1205                7AF236201E79A3E400438A05 /* WebErrors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF2361E1E79A3B400438A05 /* WebErrors.cpp */; };
     1206                7AF236211E79A40800438A05 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF2361F1E79A3D800438A05 /* WebErrors.h */; };
     1207                7AF236231E79A44400438A05 /* WebErrorsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */; };
    12061208                7C065F2B1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */; };
    12071209                7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
    … …  
    15291531                BC111A60112F4FBB00337BAB /* WebInspectorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111A59112F4FBB00337BAB /* WebInspectorClient.cpp */; };
    15301532                BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111ADC112F5B9300337BAB /* WebFrame.cpp */; };
    1531                 BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */; };
    15321533                BC111AE4112F5C2600337BAB /* WebProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111AE3112F5C2600337BAB /* WebProcess.cpp */; };
    15331534                BC111B09112F5E3C00337BAB /* ResponsivenessTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */; };
    … …  
    23762377                1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiver.h; sourceTree = "<group>"; };
    23772378                1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHistoryDelegatePrivate.h; sourceTree = "<group>"; };
    2378                 1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
    23792379                1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKProcessPoolConfiguration.mm; sourceTree = "<group>"; };
    23802380                1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKProcessPoolConfiguration.h; sourceTree = "<group>"; };
    … …  
    34683468                7A9CD8C11C77984900D9F6C7 /* WebResourceLoadStatisticsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsStore.h; sourceTree = "<group>"; };
    34693469                7A9CD8C21C779AD600D9F6C7 /* WebResourceLoadStatisticsStore.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebResourceLoadStatisticsStore.messages.in; sourceTree = "<group>"; };
     3470                7AF2361E1E79A3B400438A05 /* WebErrors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebErrors.cpp; sourceTree = "<group>"; };
     3471                7AF2361F1E79A3D800438A05 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
     3472                7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebErrorsCocoa.mm; sourceTree = "<group>"; };
    34703473                7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebUserContentControllerDataTypes.cpp; sourceTree = "<group>"; };
    34713474                7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentControllerDataTypes.h; sourceTree = "<group>"; };
    … …  
    38143817                BC111A59112F4FBB00337BAB /* WebInspectorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorClient.cpp; sourceTree = "<group>"; };
    38153818                BC111ADC112F5B9300337BAB /* WebFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFrame.cpp; sourceTree = "<group>"; };
    3816                 BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebErrorsMac.mm; sourceTree = "<group>"; };
    38173819                BC111AE3112F5C2600337BAB /* WebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcess.cpp; sourceTree = "<group>"; };
    38183820                BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimer.cpp; sourceTree = "<group>"; };
    … …  
    49474949                                939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */,
    49484950                                BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
     4951                                7AF2361E1E79A3B400438A05 /* WebErrors.cpp */,
     4952                                7AF2361F1E79A3D800438A05 /* WebErrors.h */,
    49494953                                C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
    49504954                                BC032DAF10F4380F0058C15A /* WebEvent.h */,
    … …  
    57125716                                378E1A3F181EDA010031007A /* WKObject.h */,
    57135717                                374436871820E7240049579F /* WKObject.mm */,
     5718                                7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */,
    57145719                        );
    57155720                        name = cocoa;
    … …  
    65206525                                BC111A57112F4FBB00337BAB /* WebEditorClient.cpp */,
    65216526                                BC032D6810F4378D0058C15A /* WebEditorClient.h */,
    6522                                 1A433F0C113C53DD00FACDE9 /* WebErrors.h */,
    65236527                                BC111A58112F4FBB00337BAB /* WebFrameLoaderClient.cpp */,
    65246528                                BC032D6A10F4378D0058C15A /* WebFrameLoaderClient.h */,
    … …  
    70137017                                C554FFA212E4E8EA002F22C0 /* WebDragClientMac.mm */,
    70147018                                C5237F5F12441CA300780472 /* WebEditorClientMac.mm */,
    7015                                 BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */,
    70167019                                9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */,
    70177020                                9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */,
    … …  
    85778580                                BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */,
    85788581                                BC032D7D10F4378D0058C15A /* WebEditorClient.h in Headers */,
    8579                                 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */,
    85808582                                BC032DB910F4380F0058C15A /* WebEvent.h in Headers */,
    85818583                                BC032DBB10F4380F0058C15A /* WebEventConversion.h in Headers */,
    … …  
    90109012                                377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
    90119013                                F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
     9014                                7AF236211E79A40800438A05 /* WebErrors.h in Headers */,
    90129015                                07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */,
    90139016                                4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */,
    … …  
    1015510158                                2D28F3E61885CCC1004B9EAE /* WebEditorClientIOS.mm in Sources */,
    1015610159                                C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */,
    10157                                 BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
    1015810160                                C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
    1015910161                                BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
    … …  
    1017210174                                CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */,
    1017310175                                CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */,
     10176                                7AF236231E79A44400438A05 /* WebErrorsCocoa.mm in Sources */,
    1017410177                                515BE1AA1D555A9B00DD7C68 /* WebGamepad.cpp in Sources */,
    1017510178                                515BE1771D53FE8700DD7C68 /* WebGamepadProvider.cpp in Sources */,
    … …  
    1051610519                                BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */,
    1051710520                                BC40760B124FF0270068F20A /* WKURLRequest.cpp in Sources */,
     10521                                7AF236201E79A3E400438A05 /* WebErrors.cpp in Sources */,
    1051810522                                BC40762A124FF0400068F20A /* WKURLRequestNS.mm in Sources */,
    1051910523                                BC40760D124FF0270068F20A /* WKURLResponse.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp

    r213217 r214934  
    2828
    2929#include "WebCoreArgumentCoders.h"
     30#include "WebErrors.h"
    3031#include "WebPage.h"
    3132#include "WebPageProxyMessages.h"
    3233#include "WebProcess.h"
    3334#include <WebCore/DocumentLoader.h>
    34 #include <WebCore/ErrorsGtk.h>
    3535#include <WebCore/Frame.h>
    3636#include <WebCore/IntRect.h>
Note: See TracChangeset for help on using the changeset viewer.