Attachment 211788 Details for Bug 121433 – Patch

[patch] Patch

bug-121433-20130916172733.patch (text/plain), 2.89 KB, created by Csaba Osztrogonác on 2013-09-16 08:27:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-09-16 08:27:35 PDT

Size: 2.89 KB

patch

obsolete

>Subversion Revision: 155859
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 38f2293a9cec6dfd165176ea065e6b96bcb0e558..382612a6a33b38436969d5fc1aabae536f9da688 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,18 @@
>+2013-09-16  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        [GTK][EFL] Add ResourceError::internalError() after r138387
>+        https://bugs.webkit.org/show_bug.cgi?id=121433
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org>
>+        and Kwang Yul Seo <skyul@company100.net>
>+
>+        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
>+        (WebKit::internalError):
>+        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
>+        (WebKit::internalError):
>+
> 2013-09-16  Eunmi Lee  <eunmi15.lee@samsung.com>
> 
>         [EFL][WK2] Implement pan and flick gesture.
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
>index 9d8dfda0dab74920439352dad959553bdcdaeae5..345d9c05de3fcd3c7e7b01a9052849974aabda56 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
>@@ -26,10 +26,12 @@
> #include "config.h"
> #include "WebErrors.h"
> 
>+#include "WebError.h"
> #include <WebCore/ErrorsEfl.h>
> #include <WebCore/ResourceError.h>
> #include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
>+#include <WebKit2/WKError.h>
> 
> using namespace WebCore;
> 
>@@ -70,4 +72,9 @@ ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
>     return WebCore::pluginWillHandleLoadError(response);
> }
> 
>+WebCore::ResourceError internalError(const WebCore::KURL& url)
>+{
>+    return ResourceError(WebError::webKitErrorDomain(), kWKErrorInternal, url.string(), ASCIILiteral("Internal error"));
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
>index 8375d067aeb12d892aefa68e66ea633c988263cc..3e91e256e83ef6f839e6b7aea750566cfff7f0df 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
>@@ -28,10 +28,12 @@
> #include "config.h"
> #include "WebErrors.h"
> 
>+#include "WebError.h"
> #include <WebCore/ErrorsGtk.h>
> #include <WebCore/ResourceError.h>
> #include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
>+#include <WebKit2/WKError.h>
> 
> using namespace WebCore;
> 
>@@ -72,4 +74,9 @@ ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
>     return WebCore::pluginWillHandleLoadError(response);
> }
> 
>+WebCore::ResourceError internalError(const WebCore::KURL& url)
>+{
>+    return ResourceError(WebError::webKitErrorDomain(), kWKErrorInternal, url.string(), _("Internal error"));
>+}
>+
> } // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 121433: 211788 | 211873