Title: [123534] branches/chromium/1180/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp
- Revision
- 123534
- Author
- [email protected]
- Date
- 2012-07-24 15:07:44 -0700 (Tue, 24 Jul 2012)
Log Message
Revert 123529 - Merge 123187 - [Chromium] Fix an assertion failure in TextFieldDecorationElement::hostInput()
https://bugs.webkit.org/show_bug.cgi?id=91824
BUG=136145
Review URL: https://chromiumcodereview.appspot.com/10818041
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10819007
Modified Paths
Diff
Modified: branches/chromium/1180/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp (123533 => 123534)
--- branches/chromium/1180/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp 2012-07-24 22:07:17 UTC (rev 123533)
+++ branches/chromium/1180/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp 2012-07-24 22:07:44 UTC (rev 123534)
@@ -116,10 +116,9 @@
inline HTMLInputElement* TextFieldDecorationElement::hostInput()
{
- // TextFieldDecorationElement is created only by C++ code, and it is always
- // in <input> shadow.
- ASSERT(!shadowHost() || shadowHost()->hasTagName(inputTag));
- return static_cast<HTMLInputElement*>(shadowHost());
+ ASSERT(shadowAncestorNode());
+ ASSERT(shadowAncestorNode()->hasTagName(inputTag));
+ return static_cast<HTMLInputElement*>(shadowAncestorNode());
}
bool TextFieldDecorationElement::isTextFieldDecoration() const
@@ -182,7 +181,7 @@
void TextFieldDecorationElement::defaultEventHandler(Event* event)
{
RefPtr<HTMLInputElement> input(hostInput());
- if (!input || input->disabled() || input->readOnly() || !event->isMouseEvent()) {
+ if (input->disabled() || input->readOnly() || !event->isMouseEvent()) {
if (!event->defaultHandled())
HTMLDivElement::defaultEventHandler(event);
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
