diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
| commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
| tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/dom/EventDispatcher.cpp | |
| parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
| download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/dom/EventDispatcher.cpp')
| -rw-r--r-- | Source/WebCore/dom/EventDispatcher.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/dom/EventDispatcher.cpp b/Source/WebCore/dom/EventDispatcher.cpp index ca2ed30..50d4997 100644 --- a/Source/WebCore/dom/EventDispatcher.cpp +++ b/Source/WebCore/dom/EventDispatcher.cpp @@ -99,6 +99,9 @@ void EventDispatcher::dispatchScopedEvent(Node* node, PassRefPtr<Event> event) void EventDispatcher::dispatchSimulatedClick(Node* node, PassRefPtr<Event> underlyingEvent, bool sendMouseEvents, bool showPressedLook) { + if (node->disabled()) + return; + EventDispatcher dispatcher(node); if (!gNodesDispatchingSimulatedClicks) @@ -160,8 +163,8 @@ PassRefPtr<EventTarget> EventDispatcher::adjustToShadowBoundaries(PassRefPtr<Nod } if (!diverged) { - // The relatedTarget is a parent or shadowHost of the target. - if (isShadowRootOrSVGShadowRoot(m_node.get())) + // The relatedTarget is an ancestor or shadowHost of the target. + if (m_node->shadowHost() == relatedTarget.get()) lowestCommonBoundary = m_ancestors.begin(); } else if ((*firstDivergentBoundary) == m_node.get()) { // Since ancestors does not contain target itself, we must account |