Title: [234969] trunk/Source/WebCore
- Revision
- 234969
- Author
- [email protected]
- Date
- 2018-08-16 16:30:43 -0700 (Thu, 16 Aug 2018)
Log Message
REGRESSION(r234930): Don't embed a #if in an ASSERT
https://bugs.webkit.org/show_bug.cgi?id=188680
Reviewed by Tim Horton.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleDrag):
Simplify the ASSERT -- it seems we just want to know that DragSourceActionSelection and exactly one other DragSourceAction is set.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (234968 => 234969)
--- trunk/Source/WebCore/ChangeLog 2018-08-16 23:20:56 UTC (rev 234968)
+++ trunk/Source/WebCore/ChangeLog 2018-08-16 23:30:43 UTC (rev 234969)
@@ -1,3 +1,14 @@
+2018-08-16 Ross Kirsling <[email protected]>
+
+ REGRESSION(r234930): Don't embed a #if in an ASSERT
+ https://bugs.webkit.org/show_bug.cgi?id=188680
+
+ Reviewed by Tim Horton.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleDrag):
+ Simplify the ASSERT -- it seems we just want to know that DragSourceActionSelection and exactly one other DragSourceAction is set.
+
2018-08-16 Alex Christensen <[email protected]>
Remove unused allowScriptsToCloseWindows setting
Modified: trunk/Source/WebCore/page/EventHandler.cpp (234968 => 234969)
--- trunk/Source/WebCore/page/EventHandler.cpp 2018-08-16 23:20:56 UTC (rev 234968)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2018-08-16 23:30:43 UTC (rev 234969)
@@ -3695,16 +3695,8 @@
ASSERT(dragState().source);
if (!ExactlyOneBitSet(dragState().type)) {
- ASSERT((dragState().type & DragSourceActionSelection));
- ASSERT((dragState().type & ~DragSourceActionSelection) == DragSourceActionDHTML
- || (dragState().type & ~DragSourceActionSelection) == DragSourceActionImage
-#if ENABLE(ATTACHMENT_ELEMENT)
- || (dragState().type & ~DragSourceActionSelection) == DragSourceActionAttachment
-#endif
-#if ENABLE(INPUT_TYPE_COLOR)
- || (dragState().type & ~DragSourceActionSelection) == DragSourceActionColor
-#endif
- || (dragState().type & ~DragSourceActionSelection) == DragSourceActionLink);
+ ASSERT(dragState().type & DragSourceActionSelection);
+ ASSERT(ExactlyOneBitSet(static_cast<DragSourceAction>(dragState().type & ~DragSourceActionSelection)));
dragState().type = DragSourceActionSelection;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
