Changeset 207072 in webkit

Timestamp:

Oct 11, 2016 2:25:14 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r205861 - Input type object and the associated render can go out of sync.
​https://bugs.webkit.org/show_bug.cgi?id=161871
<rdar://problem/28178094>

Reviewed by Antti Koivisto.

Source/WebCore:

Bail out when we've got a mismatched renderer.

Test: fast/forms/assert-on-input-type-change.html

• html/ImageInputType.cpp:

(WebCore::ImageInputType::altAttributeChanged):

LayoutTests:

• fast/forms/assert-on-input-type-change-expected.txt: Added.
• fast/forms/assert-on-input-type-change.html: Added.

Location:

releases/WebKitGTK/webkit-2.14

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/assert-on-input-type-change-expected.txt (added)
• LayoutTests/fast/forms/assert-on-input-type-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/ImageInputType.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-12  Zalan Bujtas  <zalan@apple.com>
+
+        Input type object and the associated render can go out of sync.
+        https://bugs.webkit.org/show_bug.cgi?id=161871
+        <rdar://problem/28178094>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/forms/assert-on-input-type-change-expected.txt: Added.
+        * fast/forms/assert-on-input-type-change.html: Added.
+
 2016-09-10  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-12  Zalan Bujtas  <zalan@apple.com>
+
+        Input type object and the associated render can go out of sync.
+        https://bugs.webkit.org/show_bug.cgi?id=161871
+        <rdar://problem/28178094>
+
+        Reviewed by Antti Koivisto.
+
+        Bail out when we've got a mismatched renderer.
+
+        Test: fast/forms/assert-on-input-type-change.html
+
+        * html/ImageInputType.cpp:
+        (WebCore::ImageInputType::altAttributeChanged):
+
 2016-09-22  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/html/ImageInputType.cpp

@@ -110 +110 @@
 void ImageInputType::altAttributeChanged()
 {
+    if (!is<RenderImage>(element().renderer()))
+        return;
+
     auto* renderer = downcast<RenderImage>(element().renderer());
     if (!renderer)