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

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

Issue 18216003: Fix an assertion failure in rendererIsFocusable of form controls. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/forms/label/label-assertion-with-active-style-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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // If we can't find a control or if the control received the click 127 // If we can't find a control or if the control received the click
128 // event, then there's no need for us to do anything. 128 // event, then there's no need for us to do anything.
129 if (!element || (evt->target() && element->containsIncludingShadowDOM(ev t->target()->toNode()))) 129 if (!element || (evt->target() && element->containsIncludingShadowDOM(ev t->target()->toNode())))
130 return; 130 return;
131 131
132 processingClick = true; 132 processingClick = true;
133 133
134 // Click the corresponding control. 134 // Click the corresponding control.
135 element->dispatchSimulatedClick(evt); 135 element->dispatchSimulatedClick(evt);
136 136
137 document()->updateLayoutIgnorePendingStylesheets();
137 if (element->isMouseFocusable()) 138 if (element->isMouseFocusable())
138 element->focus(); 139 element->focus();
139 140
140 processingClick = false; 141 processingClick = false;
141 142
142 evt->setDefaultHandled(); 143 evt->setDefaultHandled();
143 } 144 }
144 145
145 HTMLElement::defaultEventHandler(evt); 146 HTMLElement::defaultEventHandler(evt);
146 } 147 }
(...skipping 17 matching lines...) Expand all
164 165
165 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) 166 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents)
166 { 167 {
167 if (HTMLElement* element = control()) 168 if (HTMLElement* element = control())
168 element->accessKeyAction(sendMouseEvents); 169 element->accessKeyAction(sendMouseEvents);
169 else 170 else
170 HTMLElement::accessKeyAction(sendMouseEvents); 171 HTMLElement::accessKeyAction(sendMouseEvents);
171 } 172 }
172 173
173 } // namespace 174 } // namespace
OLDNEW
« no previous file with comments | « LayoutTests/fast/forms/label/label-assertion-with-active-style-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698