<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202626] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202626">202626</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 09:50:21 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when 'input' event handler for input[type=color] changes the input type
<https://webkit.org/b/159262>
<rdar://problem/27020404>
Reviewed by Daniel Bates.
Source/WebCore:
Fix based on a Blink change (patch by <tkent@chromium.org>):
<https://chromium.googlesource.com/chromium/src.git/+/a17cb3ecef49a078657524cdeaba33ad2083646c>
Test: fast/forms/color/color-type-change-on-input-crash.html
* html/ColorInputType.cpp:
(WebCore::ColorInputType::didChooseColor): Add EventQueueScope
before setValueFromRenderer() to fix the bug.
* html/HTMLInputElement.h:
(WebCore::HTMLInputElement::setValueFromRenderer): Add comment
about how to use this method.
LayoutTests:
Test based on a Blink change (patch by <tkent@chromium.org>):
<https://chromium.googlesource.com/chromium/src.git/+/a17cb3ecef49a078657524cdeaba33ad2083646c>
* fast/forms/color/color-type-change-on-input-crash-expected.txt: Added.
* fast/forms/color/color-type-change-on-input-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlColorInputTypecpp">trunk/Source/WebCore/html/ColorInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformscolorcolortypechangeoninputcrashexpectedtxt">trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformscolorcolortypechangeoninputcrashhtml">trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202625 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-29 16:18:38 UTC (rev 202625)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-06-29 David Kilzer <ddkilzer@apple.com>
+
+ Crash when 'input' event handler for input[type=color] changes the input type
+ <https://webkit.org/b/159262>
+ <rdar://problem/27020404>
+
+ Reviewed by Daniel Bates.
+
+ Test based on a Blink change (patch by <tkent@chromium.org>):
+ <https://chromium.googlesource.com/chromium/src.git/+/a17cb3ecef49a078657524cdeaba33ad2083646c>
+
+ * fast/forms/color/color-type-change-on-input-crash-expected.txt: Added.
+ * fast/forms/color/color-type-change-on-input-crash.html: Added.
+
</ins><span class="cx"> 2016-06-29 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Misc MediaStreamEvent fixes: Update build flag and remove PassRefPtr usage
</span></span></pre></div>
<a id="trunkLayoutTestsfastformscolorcolortypechangeoninputcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash-expected.txt (0 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash-expected.txt 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Changing the input type from "color" to another in "input" event handler should not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformscolorcolortypechangeoninputcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash.html (0 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash.html (rev 0)
+++ trunk/LayoutTests/fast/forms/color/color-type-change-on-input-crash.html 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script src="../../../resources/js-test.js"></script>
+</head>
+<body>
+<script>
+description('Changing the input type from "color" to another in "input" event handler should not crash.');
+
+function runTest() {
+ var input = document.createElement('input');
+ input.type = 'color';
+ input.oninput = function() {
+ this.type = 'text';
+ };
+ internals.selectColorInColorChooser(input, '#ff0000');
+}
+
+runTest();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202625 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 16:18:38 UTC (rev 202625)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-29 David Kilzer <ddkilzer@apple.com>
+
+ Crash when 'input' event handler for input[type=color] changes the input type
+ <https://webkit.org/b/159262>
+ <rdar://problem/27020404>
+
+ Reviewed by Daniel Bates.
+
+ Fix based on a Blink change (patch by <tkent@chromium.org>):
+ <https://chromium.googlesource.com/chromium/src.git/+/a17cb3ecef49a078657524cdeaba33ad2083646c>
+
+ Test: fast/forms/color/color-type-change-on-input-crash.html
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::didChooseColor): Add EventQueueScope
+ before setValueFromRenderer() to fix the bug.
+ * html/HTMLInputElement.h:
+ (WebCore::HTMLInputElement::setValueFromRenderer): Add comment
+ about how to use this method.
+
</ins><span class="cx"> 2016-06-29 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Misc MediaStreamEvent fixes: Update build flag and remove PassRefPtr usage
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlColorInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ColorInputType.cpp (202625 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ColorInputType.cpp 2016-06-29 16:18:38 UTC (rev 202625)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include "ScopedEventQueue.h"
</ins><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx">
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (element().isDisabledOrReadOnly() || color == valueAsColor())
</span><span class="cx"> return;
</span><ins>+ EventQueueScope scope;
</ins><span class="cx"> element().setValueFromRenderer(color.serialized());
</span><span class="cx"> updateColorSwatch();
</span><span class="cx"> element().dispatchFormControlChangeEvent();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (202625 => 202626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-06-29 16:18:38 UTC (rev 202625)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-06-29 16:50:21 UTC (rev 202626)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2000 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2010, 2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Samsung Electronics. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -197,6 +197,9 @@
</span><span class="cx">
</span><span class="cx"> String valueWithDefault() const;
</span><span class="cx">
</span><ins>+ // This function dispatches 'input' event for non-textfield types. Callers
+ // need to handle any DOM structure changes by event handlers, or need to
+ // delay the 'input' event with EventQueueScope.
</ins><span class="cx"> void setValueFromRenderer(const String&);
</span><span class="cx">
</span><span class="cx"> bool canHaveSelection() const;
</span></span></pre>
</div>
</div>
</body>
</html>