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

Unified Diff: Source/WebCore/html/TextFieldInputType.cpp

Issue 11293258: Merge 134377 - Crash when replacing parts of text inputs with content: url(...) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/css/html.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/TextFieldInputType.cpp
===================================================================
--- Source/WebCore/html/TextFieldInputType.cpp (revision 134456)
+++ Source/WebCore/html/TextFieldInputType.cpp (working copy)
@@ -425,6 +425,9 @@
void TextFieldInputType::attach()
{
InputType::attach();
+ // If container exists, the container should not have any content data.
+ ASSERT(!m_container || !m_container->renderStyle() || !m_container->renderStyle()->hasContent());
+
element()->fixPlaceholderRenderer(m_placeholder.get(), m_container ? m_container.get() : m_innerText.get());
}
« no previous file with comments | « Source/WebCore/css/html.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698