<!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>[164133] trunk/Source/WebCore</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/164133">164133</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-14 14:27:04 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>setSelection should not synchronously trigger layout
https://bugs.webkit.org/show_bug.cgi?id=128797
Reviewed by Antti Koivisto.
Only update the appearance and reveal selection when the style and the layout is already up to date.
Otherwise, do so in performPostLayoutTasks.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::FrameSelection):
(WebCore::FrameSelection::setSelection): Set m_pendingSelectionUpdate and synchronously update caret rect
if we don't need to update style or layout.
(WebCore::updateSelectionByUpdatingLayoutOrStyle): Added. Used by FrameSelection member functions to
trigger layout or style recalc whichever is needed.
(WebCore::FrameSelection::updateAndRevealSelection): Extracted from setSelection.
(WebCore::FrameSelection::absoluteCaretBounds): Call updateSelectionByUpdatingLayoutOrStyle since caret rect
is no longer updated synchronously in setSelection.
(WebCore::FrameSelection::recomputeCaretRect): Don't assert that visibleStart().absoluteCaretBounds() is
equal to m_absCaretBounds since selection may no longer be caret at this point.
(WebCore::FrameSelection::setCaretVisibility): Call updateSelectionByUpdatingLayoutOrStyle since we're
synchronously calling into updateAppearance here. In the future, we should make this asynchronous as well.
(WebCore::FrameSelection::selectionBounds): Call updateSelectionByUpdatingLayoutOrStyle since selection bounds
could be outdated. This code only triggering style recalc was presumably a bug.
* editing/FrameSelection.h:
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks): Update selection's appearance and scroll to reveal selection
as needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164132 => 164133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 22:09:57 UTC (rev 164132)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 22:27:04 UTC (rev 164133)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ setSelection should not synchronously trigger layout
+ https://bugs.webkit.org/show_bug.cgi?id=128797
+
+ Reviewed by Antti Koivisto.
+
+ Only update the appearance and reveal selection when the style and the layout is already up to date.
+ Otherwise, do so in performPostLayoutTasks.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::FrameSelection):
+ (WebCore::FrameSelection::setSelection): Set m_pendingSelectionUpdate and synchronously update caret rect
+ if we don't need to update style or layout.
+ (WebCore::updateSelectionByUpdatingLayoutOrStyle): Added. Used by FrameSelection member functions to
+ trigger layout or style recalc whichever is needed.
+ (WebCore::FrameSelection::updateAndRevealSelection): Extracted from setSelection.
+ (WebCore::FrameSelection::absoluteCaretBounds): Call updateSelectionByUpdatingLayoutOrStyle since caret rect
+ is no longer updated synchronously in setSelection.
+ (WebCore::FrameSelection::recomputeCaretRect): Don't assert that visibleStart().absoluteCaretBounds() is
+ equal to m_absCaretBounds since selection may no longer be caret at this point.
+ (WebCore::FrameSelection::setCaretVisibility): Call updateSelectionByUpdatingLayoutOrStyle since we're
+ synchronously calling into updateAppearance here. In the future, we should make this asynchronous as well.
+ (WebCore::FrameSelection::selectionBounds): Call updateSelectionByUpdatingLayoutOrStyle since selection bounds
+ could be outdated. This code only triggering style recalc was presumably a bug.
+ * editing/FrameSelection.h:
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks): Update selection's appearance and scroll to reveal selection
+ as needed.
+
</ins><span class="cx"> 2014-02-14 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge remaining ENABLE(SHADOW_DOM) cruft.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (164132 => 164133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-14 22:09:57 UTC (rev 164132)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-14 22:27:04 UTC (rev 164133)
</span><span class="lines">@@ -116,6 +116,9 @@
</span><span class="cx"> , m_isCaretBlinkingSuspended(false)
</span><span class="cx"> , m_focused(frame && frame->page() && frame->page()->focusController().focusedFrame() == frame)
</span><span class="cx"> , m_shouldShowBlockCursor(false)
</span><ins>+ , m_pendingSelectionUpdate(false)
+ , m_shouldRevealSelection(false)
+ , m_alwaysAlignCursorOnScrollWhenRevealingSelection(false)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_updateAppearanceEnabled(false)
</span><span class="cx"> , m_caretBlinks(true)
</span><span class="lines">@@ -313,20 +316,50 @@
</span><span class="cx"> if (!setSelectionWithoutUpdatingAppearance(selection, options, align, granularity))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ Document* document = m_frame->document();
+ if (!document)
+ return;
+
+ m_shouldRevealSelection = options & RevealSelection;
+ m_alwaysAlignCursorOnScrollWhenRevealingSelection = align == AlignCursorOnScrollAlways;
+
+ m_pendingSelectionUpdate = true;
+
+ if (document->hasPendingStyleRecalc())
+ return;
+
+ FrameView* frameView = document->view();
+ if (frameView && frameView->layoutPending())
+ return;
+
+ updateAndRevealSelection();
+}
+
+static void updateSelectionByUpdatingLayoutOrStyle(Frame& frame)
+{
</ins><span class="cx"> #if ENABLE(TEXT_CARET)
</span><del>- m_frame->document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ frame.document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx"> #else
</span><del>- m_frame->document()->updateStyleIfNeeded();
</del><ins>+ frame.document()->updateStyleIfNeeded();
</ins><span class="cx"> #endif
</span><ins>+}
+
+void FrameSelection::updateAndRevealSelection()
+{
+ if (!m_pendingSelectionUpdate)
+ return;
+
+ m_pendingSelectionUpdate = false;
+
</ins><span class="cx"> updateAppearance();
</span><span class="cx">
</span><del>- if (options & RevealSelection) {
</del><ins>+ if (m_shouldRevealSelection) {
</ins><span class="cx"> ScrollAlignment alignment;
</span><span class="cx">
</span><span class="cx"> if (m_frame->editor().behavior().shouldCenterAlignWhenSelectionIsRevealed())
</span><del>- alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignCenterAlways : ScrollAlignment::alignCenterIfNeeded;
</del><ins>+ alignment = m_alwaysAlignCursorOnScrollWhenRevealingSelection ? ScrollAlignment::alignCenterAlways : ScrollAlignment::alignCenterIfNeeded;
</ins><span class="cx"> else
</span><del>- alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignTopAlways : ScrollAlignment::alignToEdgeIfNeeded;
</del><ins>+ alignment = m_alwaysAlignCursorOnScrollWhenRevealingSelection ? ScrollAlignment::alignTopAlways : ScrollAlignment::alignToEdgeIfNeeded;
</ins><span class="cx">
</span><span class="cx"> revealSelection(alignment, RevealExtent);
</span><span class="cx"> }
</span><span class="lines">@@ -1308,6 +1341,9 @@
</span><span class="cx">
</span><span class="cx"> IntRect FrameSelection::absoluteCaretBounds()
</span><span class="cx"> {
</span><ins>+ if (!m_frame)
+ return IntRect();
+ updateSelectionByUpdatingLayoutOrStyle(*m_frame);
</ins><span class="cx"> recomputeCaretRect();
</span><span class="cx"> return m_absCaretBounds;
</span><span class="cx"> }
</span><span class="lines">@@ -1355,7 +1391,7 @@
</span><span class="cx"> IntRect oldAbsCaretBounds = m_absCaretBounds;
</span><span class="cx"> m_absCaretBounds = absoluteBoundsForLocalCaretRect(rendererForCaretPainting(caretNode.get()), newRect);
</span><span class="cx">
</span><del>- if (m_absCaretBoundsDirty) // We should be able to always assert this condition.
</del><ins>+ if (m_absCaretBoundsDirty && m_selection.isCaret()) // We should be able to always assert this condition.
</ins><span class="cx"> ASSERT(m_absCaretBounds == m_selection.visibleStart().absoluteCaretBounds());
</span><span class="cx">
</span><span class="cx"> m_absCaretBoundsDirty = false;
</span><span class="lines">@@ -1814,15 +1850,16 @@
</span><span class="cx"> if (caretVisibility() == visibility)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // FIXME: We shouldn't trigger a synchrnously layout here.
+ if (m_frame)
+ updateSelectionByUpdatingLayoutOrStyle(*m_frame);
+
</ins><span class="cx"> #if ENABLE(TEXT_CARET)
</span><del>- m_frame->document()->updateLayoutIgnorePendingStylesheets();
</del><span class="cx"> if (m_caretPaint) {
</span><span class="cx"> m_caretPaint = false;
</span><span class="cx"> invalidateCaretRect();
</span><span class="cx"> }
</span><span class="cx"> CaretBase::setCaretVisibility(visibility);
</span><del>-#else
- m_frame->document()->updateStyleIfNeeded();
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> updateAppearance();
</span><span class="lines">@@ -1920,7 +1957,7 @@
</span><span class="cx"> if (!m_frame->document())
</span><span class="cx"> return LayoutRect();
</span><span class="cx">
</span><del>- m_frame->document()->updateStyleIfNeeded();
</del><ins>+ updateSelectionByUpdatingLayoutOrStyle(*m_frame);
</ins><span class="cx"> RenderView* root = m_frame->contentRenderer();
</span><span class="cx"> FrameView* view = m_frame->view();
</span><span class="cx"> if (!root || !view)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (164132 => 164133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-02-14 22:09:57 UTC (rev 164132)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-02-14 22:27:04 UTC (rev 164133)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx">
</span><span class="cx"> const VisibleSelection& selection() const { return m_selection; }
</span><span class="cx"> void setSelection(const VisibleSelection&, SetSelectionOptions = defaultSetSelectionOptions(), CursorAlignOnScroll = AlignCursorOnScrollIfNeeded, TextGranularity = CharacterGranularity);
</span><ins>+ void updateAndRevealSelection();
</ins><span class="cx"> bool setSelectedRange(Range*, EAffinity, bool closeTyping);
</span><span class="cx"> void selectAll();
</span><span class="cx"> void clear();
</span><span class="lines">@@ -331,6 +332,9 @@
</span><span class="cx"> bool m_isCaretBlinkingSuspended : 1;
</span><span class="cx"> bool m_focused : 1;
</span><span class="cx"> bool m_shouldShowBlockCursor : 1;
</span><ins>+ bool m_pendingSelectionUpdate : 1;
+ bool m_shouldRevealSelection : 1;
+ bool m_alwaysAlignCursorOnScrollWhenRevealingSelection : 1;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_updateAppearanceEnabled : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (164132 => 164133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-02-14 22:09:57 UTC (rev 164132)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-02-14 22:27:04 UTC (rev 164133)
</span><span class="lines">@@ -2627,7 +2627,7 @@
</span><span class="cx"> m_postLayoutTasksTimer.stop();
</span><span class="cx">
</span><span class="cx"> frame().selection().setCaretRectNeedsUpdate();
</span><del>- frame().selection().updateAppearance();
</del><ins>+ frame().selection().updateAndRevealSelection();
</ins><span class="cx">
</span><span class="cx"> LayoutMilestones requestedMilestones = 0;
</span><span class="cx"> LayoutMilestones milestonesAchieved = 0;
</span></span></pre>
</div>
</div>
</body>
</html>