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

Side by Side Diff: Source/WebCore/dom/MouseEvent.cpp

Issue 12703032: Revert 146744 "Refactoring: Pull Node::disabled() and Node::isIn..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 years, 8 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 unified diff | Download patch
« no previous file with comments | « Source/WebCore/dom/GestureEvent.cpp ('k') | Source/WebCore/dom/Node.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 return static_cast<MouseEvent*>(EventDispatchMediator::event()); 293 return static_cast<MouseEvent*>(EventDispatchMediator::event());
294 } 294 }
295 295
296 bool MouseEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) cons t 296 bool MouseEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) cons t
297 { 297 {
298 if (isSyntheticMouseEvent()) { 298 if (isSyntheticMouseEvent()) {
299 EventRetargeter::adjustForMouseEvent(dispatcher->node(), *event(), disp atcher->eventPath()); 299 EventRetargeter::adjustForMouseEvent(dispatcher->node(), *event(), disp atcher->eventPath());
300 return dispatcher->dispatch(); 300 return dispatcher->dispatch();
301 } 301 }
302 302
303 if (dispatcher->node()->isElementNode() && toElement(dispatcher->node())->di sabled()) // Don't even send DOM events for disabled controls.. 303 if (dispatcher->node()->disabled()) // Don't even send DOM events for disabl ed controls..
304 return false; 304 return false;
305 305
306 if (event()->type().isEmpty()) 306 if (event()->type().isEmpty())
307 return true; // Shouldn't happen. 307 return true; // Shouldn't happen.
308 308
309 ASSERT(!event()->target() || event()->target() != event()->relatedTarget()); 309 ASSERT(!event()->target() || event()->target() != event()->relatedTarget());
310 310
311 EventTarget* relatedTarget = event()->relatedTarget(); 311 EventTarget* relatedTarget = event()->relatedTarget();
312 EventRetargeter::adjustForMouseEvent(dispatcher->node(), *event(), dispatch er->eventPath()); 312 EventRetargeter::adjustForMouseEvent(dispatcher->node(), *event(), dispatch er->eventPath());
313 313
(...skipping 13 matching lines...) Expand all
327 event()->button(), relatedTarget); 327 event()->button(), relatedTarget);
328 if (event()->defaultHandled()) 328 if (event()->defaultHandled())
329 doubleClickEvent->setDefaultHandled(); 329 doubleClickEvent->setDefaultHandled();
330 EventDispatcher::dispatchEvent(dispatcher->node(), MouseEventDispatchMediato r::create(doubleClickEvent)); 330 EventDispatcher::dispatchEvent(dispatcher->node(), MouseEventDispatchMediato r::create(doubleClickEvent));
331 if (doubleClickEvent->defaultHandled() || doubleClickEvent->defaultPrevented ()) 331 if (doubleClickEvent->defaultHandled() || doubleClickEvent->defaultPrevented ())
332 return false; 332 return false;
333 return !swallowEvent; 333 return !swallowEvent;
334 } 334 }
335 335
336 } // namespace WebCore 336 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/GestureEvent.cpp ('k') | Source/WebCore/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698