Title: [167291] trunk/Source/WebCore
- Revision
- 167291
- Author
- [email protected]
- Date
- 2014-04-14 20:06:21 -0700 (Mon, 14 Apr 2014)
Log Message
REGRESSION (r158617): Find on Page can get stuck in a loop when the search string occurs in an <input> in a <fieldset>
https://bugs.webkit.org/show_bug.cgi?id=126322
Reviewed by Ryosuke Niwa.
One additional tweak to the fix for the bug above.
Fixes crash in editing/editability/ignored-content.html test.
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::canContainRangeEndPoint): Call through to
HTMLElement::canContainRangeEndPoint, bypassing HTMLPlugInElement override
that always returns false. Without this change, this function was always
returning false.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167290 => 167291)
--- trunk/Source/WebCore/ChangeLog 2014-04-15 02:54:13 UTC (rev 167290)
+++ trunk/Source/WebCore/ChangeLog 2014-04-15 03:06:21 UTC (rev 167291)
@@ -1,3 +1,19 @@
+2014-04-14 Darin Adler <[email protected]>
+
+ REGRESSION (r158617): Find on Page can get stuck in a loop when the search string occurs in an <input> in a <fieldset>
+ https://bugs.webkit.org/show_bug.cgi?id=126322
+
+ Reviewed by Ryosuke Niwa.
+
+ One additional tweak to the fix for the bug above.
+ Fixes crash in editing/editability/ignored-content.html test.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::canContainRangeEndPoint): Call through to
+ HTMLElement::canContainRangeEndPoint, bypassing HTMLPlugInElement override
+ that always returns false. Without this change, this function was always
+ returning false.
+
2014-04-14 Simon Fraser <[email protected]>
Crash in TileController::tileRevalidationTimerFired
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (167290 => 167291)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-04-15 02:54:13 UTC (rev 167290)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-04-15 03:06:21 UTC (rev 167291)
@@ -513,7 +513,11 @@
bool HTMLObjectElement::canContainRangeEndPoint() const
{
- return m_useFallbackContent && HTMLPlugInImageElement::canContainRangeEndPoint();
+ // Call through to HTMLElement because we need to skip HTMLPlugInElement
+ // when calling through to the derived class since returns false unconditionally.
+ // An object element with fallback content should basically be treated like
+ // a generic HTML element.
+ return m_useFallbackContent && HTMLElement::canContainRangeEndPoint();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
