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

Side by Side Diff: third_party/WebKit/WebCore/html/HTMLInputElement.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
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, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) 7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 evt->setDefaultHandled(); 1108 evt->setDefaultHandled();
1109 return; 1109 return;
1110 } 1110 }
1111 1111
1112 if (inputType() == RADIO && evt->isMouseEvent() 1112 if (inputType() == RADIO && evt->isMouseEvent()
1113 && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(ev t)->button() == LeftButton) { 1113 && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(ev t)->button() == LeftButton) {
1114 evt->setDefaultHandled(); 1114 evt->setDefaultHandled();
1115 return; 1115 return;
1116 } 1116 }
1117 1117
1118 // Let the key handling done in Node take precedence over the event handling here for editable text fields 1118 // Let the key handling done in EventTargetNode take precedence over the eve nt handling here for editable text fields
1119 if (!clickDefaultFormButton) { 1119 if (!clickDefaultFormButton) {
1120 HTMLFormControlElementWithState::defaultEventHandler(evt); 1120 HTMLFormControlElementWithState::defaultEventHandler(evt);
1121 if (evt->defaultHandled()) 1121 if (evt->defaultHandled())
1122 return; 1122 return;
1123 } 1123 }
1124 1124
1125 // DOMActivate events cause the input to be "activated" - in the case of ima ge and submit inputs, this means 1125 // DOMActivate events cause the input to be "activated" - in the case of ima ge and submit inputs, this means
1126 // actually submitting the form. For reset inputs, the form is reset. These events are sent when the user clicks 1126 // actually submitting the form. For reset inputs, the form is reset. These events are sent when the user clicks
1127 // on the element, or presses enter while it is the active element. JavaScri pt code wishing to activate the element 1127 // on the element, or presses enter while it is the active element. JavaScri pt code wishing to activate the element
1128 // must dispatch a DOMActivate event - a click event will not do the job. 1128 // must dispatch a DOMActivate event - a click event will not do the job.
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 } 1551 }
1552 1552
1553 bool HTMLInputElement::placeholderShouldBeVisible() const 1553 bool HTMLInputElement::placeholderShouldBeVisible() const
1554 { 1554 {
1555 return m_data.placeholderShouldBeVisible(); 1555 return m_data.placeholderShouldBeVisible();
1556 } 1556 }
1557 1557
1558 } // namespace 1558 } // namespace
1559 1559
1560 1560
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/html/HTMLFormElement.cpp ('k') | third_party/WebKit/WebCore/html/HTMLParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698