Merge 73270 - 2010-12-03 Dimitri Glazkov <dglazkov@chromium.org>...

WebCore/html/HTMLLabelElement.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, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 101 matching lines @@
 
 void HTMLLabelElement::defaultEventHandler(Event* evt)
 {
     static bool processingClick = false;
 
     if (evt->type() == eventNames().clickEvent && !processingClick) {
         RefPtr<HTMLElement> element = control();
 
         // If we can't find a control or if the control received the click
         // event, then there's no need for us to do anything.
-        if (!element || (evt->target() && element->contains(evt->target()->toNode())))
+        if (!element || (evt->target() && element->containsIncludingShadowDOM(evt->target()->toNode())))
             return;
 
         processingClick = true;
 
         // Click the corresponding control.
         element->dispatchSimulatedClick(evt);
 
         // If the control can be focused via the mouse, then do that too.
         if (element->isMouseFocusable())
             element->focus();
@@ skipping 26 matching lines @@
     if (attribute->name() == forAttr) {
         // htmlFor attribute change affects other nodes than this.
         // Clear the caches to ensure that the labels caches are cleared.
         if (document())
             document()->notifyLocalNodeListsLabelChanged();
     } else
         HTMLElement::parseMappedAttribute(attribute);
 }
                 
 } // namespace