<!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>[160065] 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/160065">160065</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 20:21:51 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Potential crash in RenderView::selectionBounds and RenderView::repaintSelection
https://bugs.webkit.org/show_bug.cgi?id=125207
Reviewed by Simon Fraser.
Merge https://chromium.googlesource.com/chromium/blink/+/f9e6e288a5aa959f05c374806121aaf0fc52d440
Update style in FrameSelection instead of RenderView's member functions. These are the last two
member functions of RenderView that updates the style.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::focusedOrActiveStateChanged):
(WebCore::FrameSelection::bounds):
* rendering/RenderView.cpp:
(WebCore::RenderView::selectionBounds):
(WebCore::RenderView::repaintSelection):</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="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160064 => 160065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-04 03:23:52 UTC (rev 160064)
+++ trunk/Source/WebCore/ChangeLog 2013-12-04 04:21:51 UTC (rev 160065)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ Potential crash in RenderView::selectionBounds and RenderView::repaintSelection
+ https://bugs.webkit.org/show_bug.cgi?id=125207
+
+ Reviewed by Simon Fraser.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/f9e6e288a5aa959f05c374806121aaf0fc52d440
+
+ Update style in FrameSelection instead of RenderView's member functions. These are the last two
+ member functions of RenderView that updates the style.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::focusedOrActiveStateChanged):
+ (WebCore::FrameSelection::bounds):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::selectionBounds):
+ (WebCore::RenderView::repaintSelection):
+
</ins><span class="cx"> 2013-12-03 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/125143> Improve the formatting in the generated Objective-C headers.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (160064 => 160065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-04 03:23:52 UTC (rev 160064)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-04 04:21:51 UTC (rev 160065)
</span><span class="lines">@@ -1687,11 +1687,14 @@
</span><span class="cx"> void FrameSelection::focusedOrActiveStateChanged()
</span><span class="cx"> {
</span><span class="cx"> bool activeAndFocused = isFocusedAndActive();
</span><ins>+ Ref<Document> document(*m_frame->document());
</ins><span class="cx">
</span><ins>+ document->updateStyleIfNeeded();
+
</ins><span class="cx"> // Because RenderObject::selectionBackgroundColor() and
</span><span class="cx"> // RenderObject::selectionForegroundColor() check if the frame is active,
</span><span class="cx"> // we have to update places those colors were painted.
</span><del>- if (RenderView* view = m_frame->document()->renderView())
</del><ins>+ if (RenderView* view = document->renderView())
</ins><span class="cx"> view->repaintSelection();
</span><span class="cx">
</span><span class="cx"> // Caret appears in the active frame.
</span><span class="lines">@@ -1705,7 +1708,7 @@
</span><span class="cx"> // Because StyleResolver::checkOneSelector() and
</span><span class="cx"> // RenderTheme::isFocused() check if the frame is active, we have to
</span><span class="cx"> // update style and theme state that depended on those.
</span><del>- if (Element* element = m_frame->document()->focusedElement()) {
</del><ins>+ if (Element* element = document->focusedElement()) {
</ins><span class="cx"> element->setNeedsStyleRecalc();
</span><span class="cx"> if (RenderObject* renderer = element->renderer())
</span><span class="cx"> if (renderer && renderer->style().hasAppearance())
</span><span class="lines">@@ -1920,6 +1923,10 @@
</span><span class="cx">
</span><span class="cx"> FloatRect FrameSelection::bounds(bool clipToVisibleContent) const
</span><span class="cx"> {
</span><ins>+ if (!m_frame->document())
+ return LayoutRect();
+
+ m_frame->document()->updateStyleIfNeeded();
</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="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (160064 => 160065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2013-12-04 03:23:52 UTC (rev 160064)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-12-04 04:21:51 UTC (rev 160065)
</span><span class="lines">@@ -667,8 +667,6 @@
</span><span class="cx">
</span><span class="cx"> IntRect RenderView::selectionBounds(bool clipToVisibleContent) const
</span><span class="cx"> {
</span><del>- document().updateStyleIfNeeded();
-
</del><span class="cx"> typedef HashMap<RenderObject*, OwnPtr<RenderSelectionInfo>> SelectionMap;
</span><span class="cx"> SelectionMap selectedObjects;
</span><span class="cx">
</span><span class="lines">@@ -709,8 +707,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::repaintSelection() const
</span><span class="cx"> {
</span><del>- document().updateStyleIfNeeded();
-
</del><span class="cx"> HashSet<RenderBlock*> processedBlocks;
</span><span class="cx">
</span><span class="cx"> RenderObject* end = rendererAfterPosition(m_selectionEnd, m_selectionEndPos);
</span></span></pre>
</div>
</div>
</body>
</html>