Title: [157401] trunk/Source/WebCore
- Revision
- 157401
- Author
- [email protected]
- Date
- 2013-10-14 08:45:35 -0700 (Mon, 14 Oct 2013)
Log Message
Reintroduce PassRefPtr<Event> copy in ScopedEventQueue::dispatchEvent
https://bugs.webkit.org/show_bug.cgi?id=122742
Reviewed by Alexey Proskuryakov.
This is a follow-up to r157219 which introduced a workaround for the GCC's quirky behavior that
was resulting in crashes due to the PassRefPtr<Event> object passed to EventDispatcher::dispatchEvent
being copied and nullified first before retrieving the EventTarget of the Event object wrapped in that
PassRefPtr.
The implementation is now adjusted to first retrieve the pointer to the Event's EventTarget and store
it in a local variable. That variable is then passed as the first parameter to EventDispatcher::dispatchEvent,
and the PassRefPtr<Event> passed directly as the second parameter. Previously the pointer of that PassRefPtr
object was passed in, with a new PassRefPtr being created which would increase the reference count of the
ref-counted object. Passing in the original PassRefPtr avoids the unnecessary reference count increase by creating
a copy. That still nullifies the original PassRefPtr, but that's not a problem anymore.
* dom/ScopedEventQueue.cpp:
(WebCore::ScopedEventQueue::dispatchEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157400 => 157401)
--- trunk/Source/WebCore/ChangeLog 2013-10-14 15:34:50 UTC (rev 157400)
+++ trunk/Source/WebCore/ChangeLog 2013-10-14 15:45:35 UTC (rev 157401)
@@ -1,3 +1,25 @@
+2013-10-14 Zan Dobersek <[email protected]>
+
+ Reintroduce PassRefPtr<Event> copy in ScopedEventQueue::dispatchEvent
+ https://bugs.webkit.org/show_bug.cgi?id=122742
+
+ Reviewed by Alexey Proskuryakov.
+
+ This is a follow-up to r157219 which introduced a workaround for the GCC's quirky behavior that
+ was resulting in crashes due to the PassRefPtr<Event> object passed to EventDispatcher::dispatchEvent
+ being copied and nullified first before retrieving the EventTarget of the Event object wrapped in that
+ PassRefPtr.
+
+ The implementation is now adjusted to first retrieve the pointer to the Event's EventTarget and store
+ it in a local variable. That variable is then passed as the first parameter to EventDispatcher::dispatchEvent,
+ and the PassRefPtr<Event> passed directly as the second parameter. Previously the pointer of that PassRefPtr
+ object was passed in, with a new PassRefPtr being created which would increase the reference count of the
+ ref-counted object. Passing in the original PassRefPtr avoids the unnecessary reference count increase by creating
+ a copy. That still nullifies the original PassRefPtr, but that's not a problem anymore.
+
+ * dom/ScopedEventQueue.cpp:
+ (WebCore::ScopedEventQueue::dispatchEvent):
+
2013-10-14 Bear Travis <[email protected]>
[CSS Shapes] Shape-Margin should be animatable
Modified: trunk/Source/WebCore/dom/ScopedEventQueue.cpp (157400 => 157401)
--- trunk/Source/WebCore/dom/ScopedEventQueue.cpp 2013-10-14 15:34:50 UTC (rev 157400)
+++ trunk/Source/WebCore/dom/ScopedEventQueue.cpp 2013-10-14 15:45:35 UTC (rev 157401)
@@ -79,10 +79,11 @@
void ScopedEventQueue::dispatchEvent(PassRefPtr<Event> event) const
{
ASSERT(event->target());
- // Passing a naked Event pointer instead of the PassRefPtr<Event> prevents the PassRefPtr copy
- // that nullifies the original PassRefPtr. This prevents crashes on GCC-compiled code since
- // GCC creates the copy first, which leaves the event->target() call to be made on a null pointer.
- EventDispatcher::dispatchEvent(event->target()->toNode(), event.get());
+ // Passing the PassRefPtr<Event> object into the method call creates a new copy and also nullifies
+ // the original object, which is causing crashes in GCC-compiled code that only after that goes on
+ // to retrieve the Event's target, calling Event::target() on the now-null PassRefPtr<Event> object.
+ Node* node = event->target()->toNode();
+ EventDispatcher::dispatchEvent(node, event);
}
ScopedEventQueue* ScopedEventQueue::instance()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
