Title: [181772] trunk/Source/WebCore
Revision
181772
Author
[email protected]
Date
2015-03-19 17:44:12 -0700 (Thu, 19 Mar 2015)

Log Message

One more build fix after r181760.

* page/EventHandler.cpp:
(WebCore::EventHandler::handleDrag):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (181771 => 181772)


--- trunk/Source/WebCore/ChangeLog	2015-03-20 00:38:14 UTC (rev 181771)
+++ trunk/Source/WebCore/ChangeLog	2015-03-20 00:44:12 UTC (rev 181772)
@@ -1,3 +1,10 @@
+2015-03-19  Enrica Casucci  <[email protected]>
+
+        One more build fix after r181760.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleDrag):
+
 2015-03-19  Jessie Berlin  <[email protected]>
 
         Build fix after r181760.

Modified: trunk/Source/WebCore/page/EventHandler.cpp (181771 => 181772)


--- trunk/Source/WebCore/page/EventHandler.cpp	2015-03-20 00:38:14 UTC (rev 181771)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2015-03-20 00:44:12 UTC (rev 181772)
@@ -3431,14 +3431,16 @@
     
     if (!ExactlyOneBitSet(dragState().type)) {
         ASSERT((dragState().type & DragSourceActionSelection));
+#if ENABLE(ATTACHMENT_ELEMENT)
         ASSERT((dragState().type & ~DragSourceActionSelection) == DragSourceActionDHTML
+               || (dragState().type & ~DragSourceActionSelection) == DragSourceActionImage
+               || (dragState().type & ~DragSourceActionSelection) == DragSourceActionAttachment
+               || (dragState().type & ~DragSourceActionSelection) == DragSourceActionLink);
+#else
+        ASSERT((dragState().type & ~DragSourceActionSelection) == DragSourceActionDHTML
             || (dragState().type & ~DragSourceActionSelection) == DragSourceActionImage
-#ifndef NDEBUG
-#if ENABLE(ATTACHMENT_ELEMENT)
-            || (dragState().type & ~DragSourceActionSelection) == DragSourceActionAttachment
+            || (dragState().type & ~DragSourceActionSelection) == DragSourceActionLink);
 #endif
-#endif
-            || (dragState().type & ~DragSourceActionSelection) == DragSourceActionLink);
         dragState().type = DragSourceActionSelection;
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to