WebKit Bugzilla
Attachment 347314 Details for
Bug 188680
: REGRESSION(r234930): Don't embed a #if in an ASSERT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-188680-20180816153210.patch (text/plain), 2.07 KB, created by
Ross Kirsling
on 2018-08-16 15:32:10 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Ross Kirsling
Created:
2018-08-16 15:32:10 PDT
Size:
2.07 KB
patch
obsolete
>Subversion Revision: 234944 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 3291bcd0151ade3e3aa164178343e1ab2686c4c3..61a562e172f1688466f6019379e03e7126b6176d 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,14 @@ >+2018-08-16 Ross Kirsling <ross.kirsling@sony.com> >+ >+ REGRESSION(r234930): Don't embed a #if in an ASSERT >+ https://bugs.webkit.org/show_bug.cgi?id=188680 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * 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 Ryosuke Niwa <rniwa@webkit.org> > > Perform a microtask checkpoint before creating a custom element >diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp >index 28605ea4d8dcdc85d981bff3d06ec4e2d7729a08..a8df7718fc83370bd14fafc235cbc2209a94b9c1 100644 >--- a/Source/WebCore/page/EventHandler.cpp >+++ b/Source/WebCore/page/EventHandler.cpp >@@ -3695,16 +3695,8 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr > 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; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 188680
: 347314