Title: [101513] trunk/Source/WebCore
- Revision
- 101513
- Author
- jknot...@chromium.org
- Date
- 2011-11-30 07:28:02 -0800 (Wed, 30 Nov 2011)
Log Message
Remove unnecessary asserts in HTMLTextAreaElement.
https://bugs.webkit.org/show_bug.cgi?id=73135
http://code.google.com/p/chromium/issues/detail?id=103228 shows
that sometimes we are hitting the following assert in
HTMLTextAreaElement::updateFocusAppearance:
ASSERT(!document()->childNeedsAndNotInStyleRecalc());
This assert was added by https://bugs.webkit.org/show_bug.cgi?id=27474
as part of a fix for a crash when the selection is set immediately
after setting display:none.
All the methods called by updateFocusAppearance already handle the
case of the document having the childNeedsStyleRecalc flag set, so
this assert is unnecessary. The ASSERT(renderer()) is similarly
redundant.
Reviewed by Kent Tamura.
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::updateFocusAppearance):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101512 => 101513)
--- trunk/Source/WebCore/ChangeLog 2011-11-30 15:24:07 UTC (rev 101512)
+++ trunk/Source/WebCore/ChangeLog 2011-11-30 15:28:02 UTC (rev 101513)
@@ -1,3 +1,28 @@
+2011-11-30 John Knottenbelt <jknot...@chromium.org>
+
+ Remove unnecessary asserts in HTMLTextAreaElement.
+ https://bugs.webkit.org/show_bug.cgi?id=73135
+
+ http://code.google.com/p/chromium/issues/detail?id=103228 shows
+ that sometimes we are hitting the following assert in
+ HTMLTextAreaElement::updateFocusAppearance:
+
+ ASSERT(!document()->childNeedsAndNotInStyleRecalc());
+
+ This assert was added by https://bugs.webkit.org/show_bug.cgi?id=27474
+ as part of a fix for a crash when the selection is set immediately
+ after setting display:none.
+
+ All the methods called by updateFocusAppearance already handle the
+ case of the document having the childNeedsStyleRecalc flag set, so
+ this assert is unnecessary. The ASSERT(renderer()) is similarly
+ redundant.
+
+ Reviewed by Kent Tamura.
+
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::updateFocusAppearance):
+
2011-11-30 Adam Roben <aro...@apple.com>
Clang build fix after r101507
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (101512 => 101513)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2011-11-30 15:24:07 UTC (rev 101512)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2011-11-30 15:28:02 UTC (rev 101513)
@@ -198,9 +198,6 @@
void HTMLTextAreaElement::updateFocusAppearance(bool restorePreviousSelection)
{
- ASSERT(renderer());
- ASSERT(!document()->childNeedsAndNotInStyleRecalc());
-
if (!restorePreviousSelection || !hasCachedSelection()) {
// If this is the first focus, set a caret at the beginning of the text.
// This matches some browsers' behavior; see bug 11746 Comment #15.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
