Changeset 167291 in webkit

Timestamp:

Apr 14, 2014 8:06:21 PM (10 years ago)

Author:

Darin Adler

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-14  Darin Adler  <darin@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -514 +514 @@
 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();
+}
+
+}