Diff
Modified: trunk/Source/WebCore/ChangeLog (92258 => 92259)
--- trunk/Source/WebCore/ChangeLog 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/ChangeLog 2011-08-03 04:26:52 UTC (rev 92259)
@@ -1,3 +1,29 @@
+2011-08-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92256.
+ http://trac.webkit.org/changeset/92256
+ https://bugs.webkit.org/show_bug.cgi?id=65593
+
+ Causing tons of crashes on the chromium win bots (Requested by
+ jamesr on #webkit).
+
+ * dom/Event.cpp:
+ * dom/Event.h:
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventDispatcher::dispatchEvent):
+ * dom/EventDispatcher.h:
+ * dom/KeyboardEvent.cpp:
+ * dom/KeyboardEvent.h:
+ * dom/MouseEvent.cpp:
+ * dom/MouseEvent.h:
+ * dom/Node.cpp:
+ (WebCore::Node::dispatchEvent):
+ (WebCore::Node::dispatchKeyEvent):
+ (WebCore::Node::dispatchMouseEvent):
+ (WebCore::Node::dispatchWheelEvent):
+ * dom/WheelEvent.cpp:
+ * dom/WheelEvent.h:
+
2011-08-02 Hayato Ito <[email protected]>
Make EventDispatchMediator RefCounted.
Modified: trunk/Source/WebCore/dom/Event.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/Event.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/Event.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -289,11 +289,6 @@
m_underlyingEvent = ue;
}
-PassRefPtr<EventDispatchMediator> EventDispatchMediator::create(PassRefPtr<Event> event)
-{
- return adoptRef(new EventDispatchMediator(event));
-}
-
EventDispatchMediator::EventDispatchMediator(PassRefPtr<Event> event)
: m_event(event)
{
Modified: trunk/Source/WebCore/dom/Event.h (92258 => 92259)
--- trunk/Source/WebCore/dom/Event.h 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/Event.h 2011-08-03 04:26:52 UTC (rev 92259)
@@ -199,15 +199,14 @@
RefPtr<Event> m_underlyingEvent;
};
-class EventDispatchMediator : public RefCounted<Event> {
+class EventDispatchMediator {
public:
- static PassRefPtr<EventDispatchMediator> create(PassRefPtr<Event>);
+ explicit EventDispatchMediator(PassRefPtr<Event>);
virtual ~EventDispatchMediator();
virtual bool dispatchEvent(EventDispatcher*) const;
protected:
- explicit EventDispatchMediator(PassRefPtr<Event>);
EventDispatchMediator();
Event* event() const;
Modified: trunk/Source/WebCore/dom/EventDispatcher.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/EventDispatcher.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/EventDispatcher.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -46,12 +46,12 @@
static HashSet<Node*>* gNodesDispatchingSimulatedClicks = 0;
-bool EventDispatcher::dispatchEvent(Node* node, PassRefPtr<EventDispatchMediator> mediator)
+bool EventDispatcher::dispatchEvent(Node* node, const EventDispatchMediator& mediator)
{
ASSERT(!eventDispatchForbidden());
EventDispatcher dispatcher(node);
- return mediator->dispatchEvent(&dispatcher);
+ return mediator.dispatchEvent(&dispatcher);
}
static EventTarget* findElementInstance(Node* referenceNode)
Modified: trunk/Source/WebCore/dom/EventDispatcher.h (92258 => 92259)
--- trunk/Source/WebCore/dom/EventDispatcher.h 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/EventDispatcher.h 2011-08-03 04:26:52 UTC (rev 92259)
@@ -48,9 +48,8 @@
class EventDispatcher {
public:
- static bool dispatchEvent(Node*, PassRefPtr<EventDispatchMediator>);
+ static bool dispatchEvent(Node*, const EventDispatchMediator&);
static void dispatchScopedEvent(Node*, PassRefPtr<Event>);
- static void dispatchScopedEventDispatchMediator(Node*, PassRefPtr<EventDispatchMediator>);
static void dispatchSimulatedClick(Node*, PassRefPtr<Event> underlyingEvent, bool sendMouseEvents, bool showPressedLook);
Modified: trunk/Source/WebCore/dom/KeyboardEvent.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/KeyboardEvent.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/KeyboardEvent.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -159,11 +159,6 @@
return 0;
}
-PassRefPtr<KeyboardEventDispatchMediator> KeyboardEventDispatchMediator::create(PassRefPtr<KeyboardEvent> event)
-{
- return adoptRef(new KeyboardEventDispatchMediator(event));
-}
-
KeyboardEventDispatchMediator::KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent> event)
: EventDispatchMediator(event)
{
Modified: trunk/Source/WebCore/dom/KeyboardEvent.h (92258 => 92259)
--- trunk/Source/WebCore/dom/KeyboardEvent.h 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/KeyboardEvent.h 2011-08-03 04:26:52 UTC (rev 92259)
@@ -117,9 +117,9 @@
class KeyboardEventDispatchMediator : public EventDispatchMediator {
public:
- static PassRefPtr<KeyboardEventDispatchMediator> create(PassRefPtr<KeyboardEvent>);
+ explicit KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent>);
+
private:
- explicit KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent>);
virtual bool dispatchEvent(EventDispatcher*) const;
};
Modified: trunk/Source/WebCore/dom/MouseEvent.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/MouseEvent.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/MouseEvent.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -159,11 +159,6 @@
}
}
-PassRefPtr<MouseEventDispatchMediator> MouseEventDispatchMediator::create(PassRefPtr<MouseEvent> mouseEvent)
-{
- return adoptRef(new MouseEventDispatchMediator(mouseEvent));
-}
-
MouseEventDispatchMediator::MouseEventDispatchMediator(PassRefPtr<MouseEvent> mouseEvent)
: EventDispatchMediator(mouseEvent)
{
Modified: trunk/Source/WebCore/dom/MouseEvent.h (92258 => 92259)
--- trunk/Source/WebCore/dom/MouseEvent.h 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/MouseEvent.h 2011-08-03 04:26:52 UTC (rev 92259)
@@ -100,10 +100,9 @@
class MouseEventDispatchMediator : public EventDispatchMediator {
public:
- static PassRefPtr<MouseEventDispatchMediator> create(PassRefPtr<MouseEvent>);
+ explicit MouseEventDispatchMediator(PassRefPtr<MouseEvent>);
private:
- explicit MouseEventDispatchMediator(PassRefPtr<MouseEvent>);
MouseEvent* event() const;
virtual bool dispatchEvent(EventDispatcher*) const;
Modified: trunk/Source/WebCore/dom/Node.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/Node.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/Node.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -2714,7 +2714,7 @@
bool Node::dispatchEvent(PassRefPtr<Event> event)
{
- return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
+ return EventDispatcher::dispatchEvent(this, EventDispatchMediator(event));
}
void Node::dispatchSubtreeModifiedEvent()
@@ -2746,13 +2746,13 @@
bool Node::dispatchKeyEvent(const PlatformKeyboardEvent& event)
{
- return EventDispatcher::dispatchEvent(this, KeyboardEventDispatchMediator::create(KeyboardEvent::create(event, document()->defaultView())));
+ return EventDispatcher::dispatchEvent(this, KeyboardEventDispatchMediator(KeyboardEvent::create(event, document()->defaultView())));
}
bool Node::dispatchMouseEvent(const PlatformMouseEvent& event, const AtomicString& eventType,
int detail, Node* relatedTarget)
{
- return EventDispatcher::dispatchEvent(this, MouseEventDispatchMediator::create(MouseEvent::create(eventType, document()->defaultView(), event, detail, relatedTarget)));
+ return EventDispatcher::dispatchEvent(this, MouseEventDispatchMediator(MouseEvent::create(eventType, document()->defaultView(), event, detail, relatedTarget)));
}
void Node::dispatchSimulatedClick(PassRefPtr<Event> event, bool sendMouseEvents, bool showPressedLook)
@@ -2762,7 +2762,7 @@
bool Node::dispatchWheelEvent(const PlatformWheelEvent& event)
{
- return EventDispatcher::dispatchEvent(this, WheelEventDispatchMediator::create(event, document()->defaultView()));
+ return EventDispatcher::dispatchEvent(this, WheelEventDispatchMediator(event, document()->defaultView()));
}
void Node::dispatchFocusEvent()
Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (92258 => 92259)
--- trunk/Source/WebCore/dom/WheelEvent.cpp 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2011-08-03 04:26:52 UTC (rev 92259)
@@ -91,11 +91,6 @@
return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::Page : WheelEvent::Pixel;
}
-PassRefPtr<WheelEventDispatchMediator> WheelEventDispatchMediator::create(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
-{
- return adoptRef(new WheelEventDispatchMediator(event, view));
-}
-
WheelEventDispatchMediator::WheelEventDispatchMediator(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
{
if (!(event.deltaX() || event.deltaY()))
Modified: trunk/Source/WebCore/dom/WheelEvent.h (92258 => 92259)
--- trunk/Source/WebCore/dom/WheelEvent.h 2011-08-03 03:59:03 UTC (rev 92258)
+++ trunk/Source/WebCore/dom/WheelEvent.h 2011-08-03 04:26:52 UTC (rev 92259)
@@ -83,9 +83,9 @@
class WheelEventDispatchMediator : public EventDispatchMediator {
public:
- static PassRefPtr<WheelEventDispatchMediator> create(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
+ WheelEventDispatchMediator(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
+
private:
- WheelEventDispatchMediator(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
WheelEvent* event() const;
virtual bool dispatchEvent(EventDispatcher*) const;
};
