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

Side by Side Diff: Source/WebCore/page/EventHandler.cpp

Issue 10446075: Merge 117957 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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/EventDispatcher.cpp ('k') | no next file » | 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after
2089 static inline SVGElementInstance* instanceAssociatedWithShadowTreeElement(Node* referenceNode) 2089 static inline SVGElementInstance* instanceAssociatedWithShadowTreeElement(Node* referenceNode)
2090 { 2090 {
2091 if (!referenceNode || !referenceNode->isSVGElement()) 2091 if (!referenceNode || !referenceNode->isSVGElement())
2092 return 0; 2092 return 0;
2093 2093
2094 Node* shadowTreeElement = referenceNode->shadowTreeRootNode(); 2094 Node* shadowTreeElement = referenceNode->shadowTreeRootNode();
2095 if (!shadowTreeElement) 2095 if (!shadowTreeElement)
2096 return 0; 2096 return 0;
2097 2097
2098 Element* shadowTreeParentElement = shadowTreeElement->shadowHost(); 2098 Element* shadowTreeParentElement = shadowTreeElement->shadowHost();
2099 if (!shadowTreeParentElement) 2099 if (!shadowTreeParentElement || !shadowTreeParentElement->hasTagName(useTag) )
2100 return 0; 2100 return 0;
2101 2101
2102 ASSERT(shadowTreeParentElement->hasTagName(useTag));
2103 return static_cast<SVGUseElement*>(shadowTreeParentElement)->instanceForShad owTreeElement(referenceNode); 2102 return static_cast<SVGUseElement*>(shadowTreeParentElement)->instanceForShad owTreeElement(referenceNode);
2104 } 2103 }
2105 #endif 2104 #endif
2106 2105
2107 void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMo useEvent& mouseEvent, bool fireMouseOverOut) 2106 void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMo useEvent& mouseEvent, bool fireMouseOverOut)
2108 { 2107 {
2109 Node* result = targetNode; 2108 Node* result = targetNode;
2110 2109
2111 // If we're capturing, we always go right to that node. 2110 // If we're capturing, we always go right to that node.
2112 if (m_capturingMouseEventsNode) 2111 if (m_capturingMouseEventsNode)
(...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
3608 if (eventType == PlatformEvent::MouseMoved && !m_touchPressed) 3607 if (eventType == PlatformEvent::MouseMoved && !m_touchPressed)
3609 return false; 3608 return false;
3610 3609
3611 SyntheticSingleTouchEvent touchEvent(event); 3610 SyntheticSingleTouchEvent touchEvent(event);
3612 return handleTouchEvent(touchEvent); 3611 return handleTouchEvent(touchEvent);
3613 } 3612 }
3614 3613
3615 #endif 3614 #endif
3616 3615
3617 } 3616 }
OLDNEW
« no previous file with comments | « Source/WebCore/dom/EventDispatcher.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698