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

Side by Side Diff: Source/core/html/HTMLLabelElement.cpp

Issue 722143002: Labels with user-select: none should pass events to control element (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed Layout tests Created 6 years, 1 month 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 | « LayoutTests/fast/forms/label/selection-disabled-label-expected.txt ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 // If the click is not simulated and the text of the label element 154 // If the click is not simulated and the text of the label element
155 // is selected by dragging over it, then return without passing the 155 // is selected by dragging over it, then return without passing the
156 // click event to control element. 156 // click event to control element.
157 // Note: a click event may be not a mouse event if created by 157 // Note: a click event may be not a mouse event if created by
158 // document.createEvent(). 158 // document.createEvent().
159 if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) { 159 if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) {
160 if (LocalFrame* frame = document().frame()) { 160 if (LocalFrame* frame = document().frame()) {
161 // Check if there is a selection and click is not on the 161 // Check if there is a selection and click is not on the
162 // selection. 162 // selection.
163 if (frame->selection().isRange() && !frame->eventHandler().mouse DownWasSingleClickInSelection()) 163 if (!Position::nodeIsUserSelectNone(this) && frame->selection(). isRange() && !frame->eventHandler().mouseDownWasSingleClickInSelection())
164 isLabelTextSelected = true; 164 isLabelTextSelected = true;
165 // If selection is there and is single click i.e. text is 165 // If selection is there and is single click i.e. text is
166 // selected by dragging over label text, then return. 166 // selected by dragging over label text, then return.
167 // Click count >=2, meaning double click or triple click, 167 // Click count >=2, meaning double click or triple click,
168 // should pass click event to control element. 168 // should pass click event to control element.
169 // Only in case of drag, *neither* we pass the click event, 169 // Only in case of drag, *neither* we pass the click event,
170 // *nor* we focus the control element. 170 // *nor* we focus the control element.
171 if (isLabelTextSelected && frame->eventHandler().clickCount() == 1) 171 if (isLabelTextSelected && frame->eventHandler().clickCount() == 1)
172 return; 172 return;
173 } 173 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const AtomicString& attributeValue) 277 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const AtomicString& attributeValue)
278 { 278 {
279 if (attributeName == formAttr) 279 if (attributeName == formAttr)
280 formAttributeChanged(); 280 formAttributeChanged();
281 else 281 else
282 HTMLElement::parseAttribute(attributeName, attributeValue); 282 HTMLElement::parseAttribute(attributeName, attributeValue);
283 } 283 }
284 284
285 } // namespace 285 } // namespace
OLDNEW
« no previous file with comments | « LayoutTests/fast/forms/label/selection-disabled-label-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698