Title: [92113] trunk/Source/WebKit2
Revision
92113
Author
commit-qu...@webkit.org
Date
2011-08-01 02:53:53 -0700 (Mon, 01 Aug 2011)

Log Message

Unreviewed, rolling out r92108.
http://trac.webkit.org/changeset/92108
https://bugs.webkit.org/show_bug.cgi?id=65459

breaks SL compile (Requested by tonyg-cr on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-08-01

* Shared/WebCoreArgumentCoders.cpp:
(CoreIPC::::encode):
(CoreIPC::::decode):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (92112 => 92113)


--- trunk/Source/WebKit2/ChangeLog	2011-08-01 09:36:54 UTC (rev 92112)
+++ trunk/Source/WebKit2/ChangeLog	2011-08-01 09:53:53 UTC (rev 92113)
@@ -1,3 +1,15 @@
+2011-08-01  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r92108.
+        http://trac.webkit.org/changeset/92108
+        https://bugs.webkit.org/show_bug.cgi?id=65459
+
+        breaks SL compile (Requested by tonyg-cr on #webkit).
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (CoreIPC::::encode):
+        (CoreIPC::::decode):
+
 2011-08-01  Amruth Raj  <amruth...@motorola.com>
 
         Custom cursors cause the WebProcess to crash

Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (92112 => 92113)


--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp	2011-08-01 09:36:54 UTC (rev 92112)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp	2011-08-01 09:53:53 UTC (rev 92113)
@@ -321,12 +321,6 @@
     if (cursor.type() != Cursor::Custom)
         return;
 
-    if (cursor.image()->isNull()) {
-        encoder->encodeBool(false); // There is no valid image being encoded.
-        return;
-    }
-
-    encoder->encodeBool(true);
     encodeImage(encoder, cursor.image());
     encoder->encode(cursor.hotSpot());
 }
@@ -350,15 +344,6 @@
         return true;
     }
 
-    bool isValidImagePresent;
-    if (!decoder->decode(isValidImagePresent))
-        return false;
-
-    if (!isValidImagePresent) {
-        cursor = Cursor(Image::nullImage(), IntPoint());
-        return true;
-    }
-
     RefPtr<Image> image;
     if (!decodeImage(decoder, image))
         return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to