Title: [108452] trunk/Source/WebKit2
- Revision
- 108452
- Author
- [email protected]
- Date
- 2012-02-21 23:37:30 -0800 (Tue, 21 Feb 2012)
Log Message
[GTK] Null ResourceErrors are encoded/decoded as empty ResourceErrors
https://bugs.webkit.org/show_bug.cgi?id=79120
Reviewed by Martin Robinson.
* Shared/gtk/WebCoreArgumentCodersGtk.cpp:
(CoreIPC::::encode): Encode a boolean to indicate whether it's a
Null error.
(CoreIPC::::decode): Check whether the error is Null and do not
continue decoding in such case.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (108451 => 108452)
--- trunk/Source/WebKit2/ChangeLog 2012-02-22 07:33:56 UTC (rev 108451)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-22 07:37:30 UTC (rev 108452)
@@ -1,3 +1,16 @@
+2012-02-21 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Null ResourceErrors are encoded/decoded as empty ResourceErrors
+ https://bugs.webkit.org/show_bug.cgi?id=79120
+
+ Reviewed by Martin Robinson.
+
+ * Shared/gtk/WebCoreArgumentCodersGtk.cpp:
+ (CoreIPC::::encode): Encode a boolean to indicate whether it's a
+ Null error.
+ (CoreIPC::::decode): Check whether the error is Null and do not
+ continue decoding in such case.
+
2012-02-21 No'am Rosenthal <[email protected]>
[Qt][WK2] Draw tiles of previous contents-scale for opaque layers if they don't intersect with previous tiles
Modified: trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp (108451 => 108452)
--- trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2012-02-22 07:33:56 UTC (rev 108451)
+++ trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2012-02-22 07:37:30 UTC (rev 108452)
@@ -170,6 +170,11 @@
void ArgumentCoder<ResourceError>::encode(ArgumentEncoder* encoder, const ResourceError& resourceError)
{
+ bool errorIsNull = resourceError.isNull();
+ encoder->encode(errorIsNull);
+ if (errorIsNull)
+ return;
+
encoder->encode(resourceError.domain());
encoder->encode(resourceError.errorCode());
encoder->encode(resourceError.failingURL());
@@ -178,6 +183,14 @@
bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceError& resourceError)
{
+ bool errorIsNull;
+ if (!decoder->decode(errorIsNull))
+ return false;
+ if (errorIsNull) {
+ resourceError = ResourceError();
+ return true;
+ }
+
String domain;
if (!decoder->decode(domain))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
