<!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>[185398] 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/185398">185398</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-09 17:57:30 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/180867">r180867</a>): Tabbing to login field on iCloud.com doesn't have highlight for text
https://bugs.webkit.org/show_bug.cgi?id=145830
Reviewed by Darin Adler.
Source/WebCore:
The bug was caused by setSelection not updating RenderView when there is a style recalc scheduled
that doesn't trigger a layout. Fixed the bug by explicitly updating the selection in
Document::recalcStyle in that case.
Test: editing/selection/update-selection-by-style-change.html
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::updateAppearanceAfterLayout): Renamed from didLayout.
* editing/FrameSelection.h:
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks):
LayoutTests:
Added a regression test.
* editing/selection/update-selection-by-style-change-expected.html: Added.
* editing/selection/update-selection-by-style-change.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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectionupdateselectionbystylechangeexpectedhtml">trunk/LayoutTests/editing/selection/update-selection-by-style-change-expected.html</a></li>
<li><a href="#trunkLayoutTestseditingselectionupdateselectionbystylechangehtml">trunk/LayoutTests/editing/selection/update-selection-by-style-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/LayoutTests/ChangeLog 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
+ https://bugs.webkit.org/show_bug.cgi?id=145830
+
+ Reviewed by Darin Adler.
+
+ Added a regression test.
+
+ * editing/selection/update-selection-by-style-change-expected.html: Added.
+ * editing/selection/update-selection-by-style-change.html: Added.
+
</ins><span class="cx"> 2015-06-09 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> SVG Fragment is not rendered if it is the css background image of an HTML element
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectionupdateselectionbystylechangeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/update-selection-by-style-change-expected.html (0 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/update-selection-by-style-change-expected.html (rev 0)
+++ trunk/LayoutTests/editing/selection/update-selection-by-style-change-expected.html 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests modifying selection after triggering a style change. Selection should be updated immediately.
+You should see the "hello" selected below as "world" turns red.</p>
+<input type="text" value="hello" autofocus/>
+<input type="text" value="world" style="color: red" />
+<style> * {outline: none} </style>
+<script>
+document.querySelector('input').select();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectionupdateselectionbystylechangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/update-selection-by-style-change.html (0 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/update-selection-by-style-change.html (rev 0)
+++ trunk/LayoutTests/editing/selection/update-selection-by-style-change.html 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests modifying selection after triggering a style change. Selection should be updated immediately.
+You should see the "hello" selected below as "world" turns red.</p>
+<input type="text" value="hello"/>
+<input type="text" value="world"/>
+<style> * {outline: none} </style>
+<script>
+
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+var inputs = document.querySelectorAll('input');
+inputs[0].focus();
+inputs[0].setSelectionRange(0, 0);
+setTimeout(function () {
+ inputs[1].style.color = 'red';
+ inputs[0].select();
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 50);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/Source/WebCore/ChangeLog 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
+ https://bugs.webkit.org/show_bug.cgi?id=145830
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by setSelection not updating RenderView when there is a style recalc scheduled
+ that doesn't trigger a layout. Fixed the bug by explicitly updating the selection in
+ Document::recalcStyle in that case.
+
+ Test: editing/selection/update-selection-by-style-change.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::updateAppearanceAfterLayout): Renamed from didLayout.
+ * editing/FrameSelection.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks):
+
</ins><span class="cx"> 2015-06-09 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaControls: Reenable resize of controls on pinch zoom
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -1811,6 +1811,9 @@
</span><span class="cx"> if (updatedCompositingLayers && !frameView.needsLayout())
</span><span class="cx"> frameView.viewportContentsChanged();
</span><span class="cx">
</span><ins>+ if (!frameView.needsLayout())
+ frameView.frame().selection().updateAppearanceAfterLayout();
+
</ins><span class="cx"> // As a result of the style recalculation, the currently hovered element might have been
</span><span class="cx"> // detached (for example, by setting display:none in the :hover style), schedule another mouseMove event
</span><span class="cx"> // to check if any other elements ended up under the mouse pointer due to re-layout.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -2222,7 +2222,7 @@
</span><span class="cx"> updateAppearance();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameSelection::didLayout()
</del><ins>+void FrameSelection::updateAppearanceAfterLayout()
</ins><span class="cx"> {
</span><span class="cx"> setCaretRectNeedsUpdate();
</span><span class="cx"> updateAndRevealSelection(AXTextStateChangeIntent());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> WEBCORE_EXPORT void clear();
</span><span class="cx"> void prepareForDestruction();
</span><span class="cx">
</span><del>- void didLayout();
</del><ins>+ void updateAppearanceAfterLayout();
</ins><span class="cx"> void setNeedsSelectionUpdate();
</span><span class="cx">
</span><span class="cx"> bool contains(const LayoutPoint&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (185397 => 185398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-06-10 00:53:13 UTC (rev 185397)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-06-10 00:57:30 UTC (rev 185398)
</span><span class="lines">@@ -2983,7 +2983,7 @@
</span><span class="cx">
</span><span class="cx"> m_postLayoutTasksTimer.stop();
</span><span class="cx">
</span><del>- frame().selection().didLayout();
</del><ins>+ frame().selection().updateAppearanceAfterLayout();
</ins><span class="cx">
</span><span class="cx"> if (m_nestedLayoutCount <= 1 && frame().document()->documentElement())
</span><span class="cx"> fireLayoutRelatedMilestonesIfNeeded();
</span></span></pre>
</div>
</div>
</body>
</html>