Merge 84587 - 2011-04-21 Dimitri Glazkov <dglazkov@chromium.org>

Source/WebCore/dom/EventDispatcher.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 145 matching lines @@
         targetAncestor--;
 
         if (isShadowRootOrSVGShadowRoot(*i))
             lowestCommonBoundary = targetAncestor;
 
         if ((*i) != (*targetAncestor).node())
             diverged = true;
     }
 
     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
         // for the possibility that target is a shadowHost of relatedTarget
         // and thus serves as the lowestCommonBoundary.
         // Luckily, in this case the firstDivergentBoundary is target.
         lowestCommonBoundary = m_ancestors.begin();
     }
 
     // Trim ancestors to lowestCommonBoundary to keep events inside of the common shadow DOM subtree.
@@ skipping 207 matching lines @@
     // Changing this breaks existing sites.
     // See https://bugs.webkit.org/show_bug.cgi?id=52195 for details.
     if (event->type() == eventNames().selectstartEvent)
         return StayInsideShadowDOM;
 
     return RetargetEvent;
 }
 
 }