<!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>[52034] trunk/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/52034">52034</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2009-12-11 17:38:41 -0800 (Fri, 11 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Small refactoring to get rid of some extra unneeded selection-related work
in RenderLayer::scrollToOffset and separate caret and range selection
logic in FrameView::layout. This may be useful later when changing how
the range selection logic works to fix layout reentrancy problems.

Reviewed by Dan Bernstein.

* page/Frame.cpp: Removed invalidateSelection.
* page/Frame.h: Ditto.

* page/FrameView.cpp:
(WebCore::FrameView::layout): Call SelectionController::setNeedsLayout
and Frame::selectionLayoutChanged instead of calling
Frame::invalidateSelection, which was just a function that called
both of those others.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollToOffset): Call
SelectionController::setNeedsLayout instead of calling
Frame::invalidateSelection. This call site only needs the caret-related
work in that first function, not the other work formerly done by
Frame::invalidateSelection. The caret works outside the normal
painting and rendering system, and the range selection highlight is
more or less inside it and doesn't need special handling when scrolling.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageFramecpp">trunk/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkWebCorepageFrameh">trunk/WebCore/page/Frame.h</a></li>
<li><a href="#trunkWebCorepageFrameViewcpp">trunk/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderLayercpp">trunk/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52033 => 52034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-12 01:34:17 UTC (rev 52033)
+++ trunk/WebCore/ChangeLog        2009-12-12 01:38:41 UTC (rev 52034)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2009-12-11  Darin Adler  &lt;darin@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Small refactoring to get rid of some extra unneeded selection-related work
+        in RenderLayer::scrollToOffset and separate caret and range selection
+        logic in FrameView::layout. This may be useful later when changing how
+        the range selection logic works to fix layout reentrancy problems.
+
+        * page/Frame.cpp: Removed invalidateSelection.
+        * page/Frame.h: Ditto.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout): Call SelectionController::setNeedsLayout
+        and Frame::selectionLayoutChanged instead of calling
+        Frame::invalidateSelection, which was just a function that called
+        both of those others.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollToOffset): Call
+        SelectionController::setNeedsLayout instead of calling
+        Frame::invalidateSelection. This call site only needs the caret-related
+        work in that first function, not the other work formerly done by
+        Frame::invalidateSelection. The caret works outside the normal
+        painting and rendering system, and the range selection highlight is
+        more or less inside it and doesn't need special handling when scrolling.
+
</ins><span class="cx"> 2009-12-11  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Frame.cpp (52033 => 52034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Frame.cpp        2009-12-12 01:34:17 UTC (rev 52033)
+++ trunk/WebCore/page/Frame.cpp        2009-12-12 01:38:41 UTC (rev 52034)
</span><span class="lines">@@ -556,12 +556,6 @@
</span><span class="cx">         toRenderTextControl(renderer)-&gt;selectionChanged(userTriggered);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Frame::invalidateSelection()
-{
-    selection()-&gt;setNeedsLayout();
-    selectionLayoutChanged();
-}
-
</del><span class="cx"> void Frame::setCaretVisible(bool flag)
</span><span class="cx"> {
</span><span class="cx">     if (m_caretVisible == flag)
</span></span></pre></div>
<a id="trunkWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Frame.h (52033 => 52034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Frame.h        2009-12-12 01:34:17 UTC (rev 52033)
+++ trunk/WebCore/page/Frame.h        2009-12-12 01:38:41 UTC (rev 52034)
</span><span class="lines">@@ -259,8 +259,6 @@
</span><span class="cx">         void selectionLayoutChanged();
</span><span class="cx">         void notifyRendererOfSelectionChange(bool userTriggered);
</span><span class="cx"> 
</span><del>-        void invalidateSelection();
-
</del><span class="cx">         void setCaretVisible(bool = true);
</span><span class="cx">         void paintCaret(GraphicsContext*, int tx, int ty, const IntRect&amp; clipRect) const;
</span><span class="cx">         void paintDragCaret(GraphicsContext*, int tx, int ty, const IntRect&amp; clipRect) const;
</span></span></pre></div>
<a id="trunkWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/FrameView.cpp (52033 => 52034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/FrameView.cpp        2009-12-12 01:34:17 UTC (rev 52033)
+++ trunk/WebCore/page/FrameView.cpp        2009-12-12 01:38:41 UTC (rev 52034)
</span><span class="lines">@@ -671,7 +671,8 @@
</span><span class="cx">         root-&gt;view()-&gt;popLayoutState();
</span><span class="cx">     m_layoutRoot = 0;
</span><span class="cx"> 
</span><del>-    m_frame-&gt;invalidateSelection();
</del><ins>+    m_frame-&gt;selection()-&gt;setNeedsLayout();
+    m_frame-&gt;selectionLayoutChanged();
</ins><span class="cx">    
</span><span class="cx">     m_layoutSchedulingEnabled = true;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderLayer.cpp (52033 => 52034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderLayer.cpp        2009-12-12 01:34:17 UTC (rev 52033)
+++ trunk/WebCore/rendering/RenderLayer.cpp        2009-12-12 01:38:41 UTC (rev 52034)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx">     // The caret rect needs to be invalidated after scrolling
</span><span class="cx">     Frame* frame = renderer()-&gt;document()-&gt;frame();
</span><span class="cx">     if (frame)
</span><del>-        frame-&gt;invalidateSelection();
</del><ins>+        frame-&gt;selection()-&gt;setNeedsLayout();
</ins><span class="cx"> 
</span><span class="cx">     // Just schedule a full repaint of our object.
</span><span class="cx">     if (repaint)
</span></span></pre>
</div>
</div>

</body>
</html>