Commit c51a8d21 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[WK2][SOUP] ResourceError.isCancellation() is not carried over IPC

https://bugs.webkit.org/show_bug.cgi?id=98882

Patch by Christophe Dumez <christophe.dumez@intel.com> on 2012-10-10
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Properly serialize / deserialize ResourceError.isCancellation
boolean so that it can be used in UIProcess.

* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(CoreIPC::::encode):
(CoreIPC::::decode):

Tools:

Do not display the error page in MiniBrowser if the loading
error corresponds to a cancellation.

* MiniBrowser/efl/main.c:
(on_error):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@130885 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0f04410b
2012-10-10 Christophe Dumez <christophe.dumez@intel.com>
[WK2][SOUP] ResourceError.isCancellation() is not carried over IPC
https://bugs.webkit.org/show_bug.cgi?id=98882
Reviewed by Kenneth Rohde Christiansen.
Properly serialize / deserialize ResourceError.isCancellation
boolean so that it can be used in UIProcess.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(CoreIPC::::encode):
(CoreIPC::::decode):
2012-10-10 Jinwoo Song <jinwoo7.song@samsung.com>
[EFL][WK2] Add APIs to get/set the DNS prefetching
......
......@@ -192,6 +192,7 @@ void ArgumentCoder<ResourceError>::encode(ArgumentEncoder* encoder, const Resour
encoder->encode(resourceError.errorCode());
encoder->encode(resourceError.failingURL());
encoder->encode(resourceError.localizedDescription());
encoder->encode(resourceError.isCancellation());
}
bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceError& resourceError)
......@@ -220,7 +221,13 @@ bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceErro
if (!decoder->decode(localizedDescription))
return false;
bool isCancellation;
if (!decoder->decode(isCancellation))
return false;
resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
resourceError.setIsCancellation(isCancellation);
return true;
}
......
2012-10-10 Christophe Dumez <christophe.dumez@intel.com>
[WK2][SOUP] ResourceError.isCancellation() is not carried over IPC
https://bugs.webkit.org/show_bug.cgi?id=98882
Reviewed by Kenneth Rohde Christiansen.
Do not display the error page in MiniBrowser if the loading
error corresponds to a cancellation.
* MiniBrowser/efl/main.c:
(on_error):
2012-10-09 Jocelyn Turcotte <jocelyn.turcotte@digia.com>
[Qt] WTR: Fix an assert triggered by EventSenderProxy::touchEnd
......
......@@ -255,6 +255,10 @@ on_error(void *user_data, Evas_Object *webview, void *event_info)
Eina_Strbuf* buffer;
const Ewk_Error *error = (const Ewk_Error *)event_info;
/* This is a cancellation, do not display the error page */
if (ewk_error_cancellation_get(error))
return;
buffer = eina_strbuf_new();
eina_strbuf_append_printf(buffer, "<html><body><div style=\"color:#ff0000\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
ewk_error_code_get(error), ewk_error_description_get(error), ewk_error_url_get(error));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment