Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: third_party/WebKit/WebCore/dom/MouseEvent.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/dom/MouseEvent.h ('k') | third_party/WebKit/WebCore/dom/Node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/dom/MouseEvent.cpp
===================================================================
--- third_party/WebKit/WebCore/dom/MouseEvent.cpp (revision 9383)
+++ third_party/WebKit/WebCore/dom/MouseEvent.cpp (working copy)
@@ -36,7 +36,7 @@
MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view,
int detail, int screenX, int screenY, int pageX, int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
- unsigned short button, PassRefPtr<EventTarget> relatedTarget,
+ unsigned short button, PassRefPtr<EventTargetNode> relatedTarget,
PassRefPtr<Clipboard> clipboard, bool isSimulated)
: MouseRelatedEvent(eventType, canBubble, cancelable, view, detail, screenX, screenY,
pageX, pageY, ctrlKey, altKey, shiftKey, metaKey, isSimulated)
@@ -54,7 +54,7 @@
void MouseEvent::initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view,
int detail, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
- unsigned short button, PassRefPtr<EventTarget> relatedTarget)
+ unsigned short button, PassRefPtr<EventTargetNode> relatedTarget)
{
if (dispatched())
return;
@@ -101,7 +101,7 @@
{
// MSIE extension - "the object toward which the user is moving the mouse pointer"
if (type() == eventNames().mouseoutEvent)
- return relatedTarget() ? relatedTarget()->toNode() : 0;
+ return relatedTarget();
return target() ? target()->toNode() : 0;
}
@@ -110,7 +110,7 @@
{
// MSIE extension - "object from which activation or the mouse pointer is exiting during the event" (huh?)
if (type() != eventNames().mouseoutEvent)
- return relatedTarget() ? relatedTarget()->toNode() : 0;
+ return relatedTarget();
return target() ? target()->toNode() : 0;
}
« no previous file with comments | « third_party/WebKit/WebCore/dom/MouseEvent.h ('k') | third_party/WebKit/WebCore/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698