<!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>[171676] 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/171676">171676</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-07-28 06:19:22 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/169105">r169105</a>): Crash in selection
https://bugs.webkit.org/show_bug.cgi?id=134303
Patch by Radu Stavila <stavila@adobe.com> on 2014-07-28
Reviewed by Mihnea Ovidenie.
Source/WebCore:
When splitting the selection between different subtrees, all subtrees must have their selection cleared before
starting to apply the new selection. Otherwise, when selecting objects in a named flow thread and going up
its containing block chain, we can end up in the view's selection root, which has not yet been updated and so
we get inconsistent data.
To achieve this goal, the selection update was split into a "clear" and an "apply" method. The updateSelectionForSubtrees
method first iterates through all subtrees and performs the "clear" method and then starts all over again
and performs the "apply" method.
Test: fast/regions/selection/crash-deselect.html
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderSelectionInfo.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::setSelection):
(WebCore::RenderView::splitSelectionBetweenSubtrees):
(WebCore::RenderView::updateSelectionForSubtrees): Added, clears and re-applies selection for all selection subtrees.
(WebCore::RenderView::clearSubtreeSelection): Added, clears selection and returns previously selected information.
(WebCore::RenderView::applySubtreeSelection): Added, updates the selection status of all objects inside the selection tree, compares old and new data and repaints accordingly.
(WebCore::RenderView::setSubtreeSelection): Deleted.
* rendering/RenderView.h:
* rendering/SelectionSubtreeRoot.cpp:
(WebCore::SelectionSubtreeRoot::SelectionSubtreeRoot):
* rendering/SelectionSubtreeRoot.h:
(WebCore::SelectionSubtreeRoot::OldSelectionData::OldSelectionData):
LayoutTests:
Added test for the crash that occurred in some cases when selecting.
Reviewed by NOBODY (OOPS!).
* fast/regions/selection/crash-deselect-expected.txt: Added.
* fast/regions/selection/crash-deselect.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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSelectionInfoh">trunk/Source/WebCore/rendering/RenderSelectionInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSelectionSubtreeRootcpp">trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSelectionSubtreeRooth">trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsselectioncrashdeselectexpectedtxt">trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsselectioncrashdeselecthtml">trunk/LayoutTests/fast/regions/selection/crash-deselect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/LayoutTests/ChangeLog 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-28 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r169105): Crash in selection
+ https://bugs.webkit.org/show_bug.cgi?id=134303
+
+ Added test for the crash that occurred in some cases when selecting.
+
+ Reviewed by Mihnea Ovidenie.
+
+ * fast/regions/selection/crash-deselect-expected.txt: Added.
+ * fast/regions/selection/crash-deselect.html: Added.
+
</ins><span class="cx"> 2014-07-28 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS: Fix :visited behavior for SubSelectors
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsselectioncrashdeselectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt (0 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+CONSOLE MESSAGE: line 66: HierarchyRequestError: DOM Exception 3: A Node was inserted somewhere it doesn't belong.
+
+Errlog selectionTest: HierarchyRequestError: HierarchyRequestError: DOM Exception 3 : index 1
+Errlog webtest_fn_24:
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsselectioncrashdeselecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/selection/crash-deselect.html (0 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/selection/crash-deselect.html (rev 0)
+++ trunk/LayoutTests/fast/regions/selection/crash-deselect.html 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+<!DOCTYPE html>
+<html id="webtest0">
+ <head id="webtest1">
+ <style id="webtest2"></style>
+ <style>
+ :last-child { -webkit-flow-into: foo; }
+ </style>
+
+ </head>
+ <body id="webtest3">
+ <script id="example"></script>
+
+ <script type="text/javascript">
+ if (window.testRunner)
+ testRunner.dumpAsText(false);
+ </script>
+
+ <script>
+ var new_elem = document.createElement("canvas");
+ new_elem.setAttribute("id", "webtest11");
+ document.querySelector("#webtest0").appendChild(new_elem);
+
+ document.write("<br><summary>");
+ </script>
+ <summary>
+ <mathml id="webtest12">
+ <femerge></femerge>
+ </mathml>
+
+ <script>
+ function selectionTest() {
+ try {
+ wf_i = 0;
+ for (; wf_i<40; wf_i++) {
+ var range = document.createRange();
+
+ range.setStartBefore(document.getElementById("webtest3"));
+ range.setEndAfter(document.getElementById("webtest2"));
+ range.deleteContents();
+
+ var markElement = document.getElementById("webtest1").appendChild(document.createElementNS("", "mark"));
+ range.setStartAfter(markElement);
+
+ var appletElement = document.getElementById("example").appendChild(document.createElement("applet"));
+ range.setEndAfter(appletElement);
+
+ range.insertNode(document.getElementById("example"));
+ }
+ } catch(e) {
+ document.write("Errlog selectionTest: " + e.name + ": " + e.message + " : index " + wf_i + " <br><table/>");
+ }
+ }
+ selectionTest();
+ </script>
+ <sub>
+
+ <script>
+ document.designMode = "on";
+ document.execCommand("SelectAll");
+ document.write("Errlog webtest_fn_24: <br><nobr>");
+
+ var femergeElement = document.getElementById("webtest12").appendChild(document.createElement("femerge"));
+ var appletElement = document.getElementById("example").appendChild(document.createElement("applet"));
+ var gradientElement = document.body.appendChild(document.createElement("gradient"));
+
+ document.getElementById("webtest2").isEqualNode(femergeElement.insertBefore(document.documentElement, gradientElement));
+ </script>
+
+ <table></table>
+ </summary>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/ChangeLog 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-07-28 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r169105): Crash in selection
+ https://bugs.webkit.org/show_bug.cgi?id=134303
+
+ Reviewed by Mihnea Ovidenie.
+
+ When splitting the selection between different subtrees, all subtrees must have their selection cleared before
+ starting to apply the new selection. Otherwise, when selecting objects in a named flow thread and going up
+ its containing block chain, we can end up in the view's selection root, which has not yet been updated and so
+ we get inconsistent data.
+
+ To achieve this goal, the selection update was split into a "clear" and an "apply" method. The updateSelectionForSubtrees
+ method first iterates through all subtrees and performs the "clear" method and then starts all over again
+ and performs the "apply" method.
+
+ Test: fast/regions/selection/crash-deselect.html
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderSelectionInfo.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::setSelection):
+ (WebCore::RenderView::splitSelectionBetweenSubtrees):
+ (WebCore::RenderView::updateSelectionForSubtrees): Added, clears and re-applies selection for all selection subtrees.
+ (WebCore::RenderView::clearSubtreeSelection): Added, clears selection and returns previously selected information.
+ (WebCore::RenderView::applySubtreeSelection): Added, updates the selection status of all objects inside the selection tree, compares old and new data and repaints accordingly.
+ (WebCore::RenderView::setSubtreeSelection): Deleted.
+ * rendering/RenderView.h:
+ * rendering/SelectionSubtreeRoot.cpp:
+ (WebCore::SelectionSubtreeRoot::SelectionSubtreeRoot):
+ * rendering/SelectionSubtreeRoot.h:
+ (WebCore::SelectionSubtreeRoot::OldSelectionData::OldSelectionData):
+
</ins><span class="cx"> 2014-07-28 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS: Fix :visited behavior for SubSelectors
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> 0F09087F1444FDB200028917 /* ScrollbarTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */; };
</span><span class="cx"> 0F099D0817B968A100FF84B9 /* WebCoreTypedArrayController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */; };
</span><span class="cx"> 0F099D0917B968A100FF84B9 /* WebCoreTypedArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F11A54E0F39233100C37884 /* RenderSelectionInfo.h */; };
</del><ins>+ 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F11A54E0F39233100C37884 /* RenderSelectionInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F13163D16ED0CC80035CC04 /* PlatformCAFilters.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F13164016ED0CDE0035CC04 /* PlatformCAFiltersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F13163F16ED0CDE0035CC04 /* PlatformCAFiltersMac.mm */; };
</span><span class="cx"> 0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */; };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSelectionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSelectionInfo.h (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSelectionInfo.h 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/rendering/RenderSelectionInfo.h 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -25,8 +25,9 @@
</span><span class="cx"> #ifndef RenderSelectionInfo_h
</span><span class="cx"> #define RenderSelectionInfo_h
</span><span class="cx">
</span><ins>+#include "GapRects.h"
</ins><span class="cx"> #include "IntRect.h"
</span><del>-#include "RenderBox.h"
</del><ins>+#include "RenderBlock.h"
</ins><span class="cx"> #include "RenderText.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -857,7 +857,9 @@
</span><span class="cx">
</span><span class="cx"> // If there is no RenderNamedFlowThreads we follow the regular selection.
</span><span class="cx"> if (!hasRenderNamedFlowThreads()) {
</span><del>- setSubtreeSelection(*this, start, startPos, end, endPos, blockRepaintMode);
</del><ins>+ RenderSubtreesMap singleSubtreeMap;
+ singleSubtreeMap.set(this, SelectionSubtreeRoot(start, startPos, end, endPos));
+ updateSelectionForSubtrees(singleSubtreeMap, blockRepaintMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -867,7 +869,6 @@
</span><span class="cx"> void RenderView::splitSelectionBetweenSubtrees(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode)
</span><span class="cx"> {
</span><span class="cx"> // Compute the visible selection end points for each of the subtrees.
</span><del>- typedef HashMap<SelectionSubtreeRoot*, SelectionSubtreeRoot> RenderSubtreesMap;
</del><span class="cx"> RenderSubtreesMap renderSubtreesMap;
</span><span class="cx">
</span><span class="cx"> SelectionSubtreeRoot initialSelection;
</span><span class="lines">@@ -901,33 +902,50 @@
</span><span class="cx"> renderSubtreesMap.set(&root, selectionData);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ updateSelectionForSubtrees(renderSubtreesMap, blockRepaintMode);
+}
</ins><span class="cx">
</span><del>- for (RenderSubtreesMap::iterator i = renderSubtreesMap.begin(); i != renderSubtreesMap.end(); ++i) {
- SelectionSubtreeRoot subtreeSelectionData = i->value;
- subtreeSelectionData.adjustForVisibleSelection(document());
- setSubtreeSelection(*i->key, subtreeSelectionData.selectionStart(), subtreeSelectionData.selectionStartPos(),
- subtreeSelectionData.selectionEnd(), subtreeSelectionData.selectionEndPos(), blockRepaintMode);
</del><ins>+void RenderView::updateSelectionForSubtrees(RenderSubtreesMap& renderSubtreesMap, SelectionRepaintMode blockRepaintMode)
+{
+ SubtreeOldSelectionDataMap oldSelectionDataMap;
+ for (auto it = renderSubtreesMap.begin(); it != renderSubtreesMap.end(); ++it) {
+ SelectionSubtreeRoot& subtreeSelectionData = it->value;
+ if (hasRenderNamedFlowThreads())
+ subtreeSelectionData.adjustForVisibleSelection(document());
+
+ std::unique_ptr<OldSelectionData> oldSelectionData = std::make_unique<OldSelectionData>();
+ clearSubtreeSelection(*it->key, blockRepaintMode, *oldSelectionData);
+ oldSelectionDataMap.set(it->key, WTF::move(oldSelectionData));
+
+ SelectionSubtreeRoot& root = *it->key;
+ root.setSelectionStart(subtreeSelectionData.selectionStart());
+ root.setSelectionStartPos(subtreeSelectionData.selectionStartPos());
+ root.setSelectionEnd(subtreeSelectionData.selectionEnd());
+ root.setSelectionEndPos(subtreeSelectionData.selectionEndPos());
</ins><span class="cx"> }
</span><ins>+
+ // Update selection status for the objects inside the selection subtrees.
+ // This needs to be done after the previous loop updated the selectionStart/End
+ // parameters of all subtrees because we're going to be climbing up the containing
+ // block chain and we might end up in a different selection subtree.
+ for (auto it = renderSubtreesMap.begin(); it != renderSubtreesMap.end(); ++it) {
+ SelectionSubtreeRoot subtreeSelectionData = it->value;
+ OldSelectionData& oldSelectionData = *oldSelectionDataMap.get(it->key);
+ applySubtreeSelection(*it->key, subtreeSelectionData.selectionStart(), subtreeSelectionData.selectionEnd(), subtreeSelectionData.selectionEndPos(), blockRepaintMode, oldSelectionData);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::setSubtreeSelection(SelectionSubtreeRoot& root, RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode)
</del><ins>+void RenderView::clearSubtreeSelection(const SelectionSubtreeRoot& root, SelectionRepaintMode blockRepaintMode, OldSelectionData& oldSelectionData)
</ins><span class="cx"> {
</span><span class="cx"> // Record the old selected objects. These will be used later
</span><span class="cx"> // when we compare against the new selected objects.
</span><del>- int oldStartPos = root.selectionStartPos();
- int oldEndPos = root.selectionEndPos();
-
- // Objects each have a single selection rect to examine.
- typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectedObjectMap;
- SelectedObjectMap oldSelectedObjects;
- SelectedObjectMap newSelectedObjects;
-
</del><ins>+ oldSelectionData.selectionStartPos = root.selectionStartPos();
+ oldSelectionData.selectionEndPos = root.selectionEndPos();
+
</ins><span class="cx"> // Blocks contain selected objects and fill gaps between them, either on the left, right, or in between lines and blocks.
</span><span class="cx"> // In order to get the repaint rect right, we have to examine left, middle, and right rects individually, since otherwise
</span><span class="cx"> // the union of those rects might remain the same even when changes have occurred.
</span><del>- typedef HashMap<RenderBlock*, std::unique_ptr<RenderBlockSelectionInfo>> SelectedBlockMap;
- SelectedBlockMap oldSelectedBlocks;
- SelectedBlockMap newSelectedBlocks;
</del><span class="cx">
</span><span class="cx"> RenderObject* os = root.selectionStart();
</span><span class="cx"> RenderObject* stop = rendererAfterPosition(root.selectionEnd(), root.selectionEndPos());
</span><span class="lines">@@ -936,11 +954,11 @@
</span><span class="cx"> if ((os->canBeSelectionLeaf() || os == root.selectionStart() || os == root.selectionEnd())
</span><span class="cx"> && os->selectionState() != SelectionNone) {
</span><span class="cx"> // Blocks are responsible for painting line gaps and margin gaps. They must be examined as well.
</span><del>- oldSelectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, true));
</del><ins>+ oldSelectionData.selectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, true));
</ins><span class="cx"> if (blockRepaintMode == RepaintNewXOROld) {
</span><span class="cx"> RenderBlock* cb = os->containingBlock();
</span><span class="cx"> while (cb && !cb->isRenderView()) {
</span><del>- std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = oldSelectedBlocks.add(cb, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = oldSelectionData.selectedBlocks.add(cb, nullptr).iterator->value;
</ins><span class="cx"> if (blockInfo)
</span><span class="cx"> break;
</span><span class="cx"> blockInfo = std::make_unique<RenderBlockSelectionInfo>(cb);
</span><span class="lines">@@ -952,17 +970,13 @@
</span><span class="cx"> os = selectionIterator.next();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Now clear the selection.
- SelectedObjectMap::iterator oldObjectsEnd = oldSelectedObjects.end();
- for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i)
</del><ins>+ auto oldObjectsEnd = oldSelectionData.selectedObjects.end();
+ for (auto i = oldSelectionData.selectedObjects.begin(); i != oldObjectsEnd; ++i)
</ins><span class="cx"> i->key->setSelectionStateIfNeeded(SelectionNone);
</span><ins>+}
</ins><span class="cx">
</span><del>- // set selection start and end
- root.setSelectionStart(start);
- root.setSelectionStartPos(startPos);
- root.setSelectionEnd(end);
- root.setSelectionEndPos(endPos);
-
</del><ins>+void RenderView::applySubtreeSelection(SelectionSubtreeRoot& root, RenderObject* start, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode, const OldSelectionData& oldSelectionData)
+{
</ins><span class="cx"> // Update the selection status of all objects between selectionStart and selectionEnd
</span><span class="cx"> if (start && start == end)
</span><span class="cx"> start->setSelectionStateIfNeeded(SelectionBoth);
</span><span class="lines">@@ -974,8 +988,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* o = start;
</span><del>- stop = rendererAfterPosition(end, endPos);
- selectionIterator = SelectionIterator(o);
</del><ins>+ RenderObject* stop = rendererAfterPosition(end, endPos);
+ SelectionIterator selectionIterator(o);
</ins><span class="cx">
</span><span class="cx"> while (o && o != stop) {
</span><span class="cx"> if (o != start && o != end && o->canBeSelectionLeaf())
</span><span class="lines">@@ -988,6 +1002,8 @@
</span><span class="cx">
</span><span class="cx"> // Now that the selection state has been updated for the new objects, walk them again and
</span><span class="cx"> // put them in the new objects list.
</span><ins>+ SelectedObjectMap newSelectedObjects;
+ SelectedBlockMap newSelectedBlocks;
</ins><span class="cx"> o = start;
</span><span class="cx"> selectionIterator = SelectionIterator(o);
</span><span class="cx"> while (o && o != stop) {
</span><span class="lines">@@ -1022,13 +1038,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Have any of the old selected objects changed compared to the new selection?
</span><del>- for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i) {
- RenderObject* obj = i->key;
</del><ins>+ auto oldObjectsEnd = oldSelectionData.selectedObjects.end();
+ for (auto it = oldSelectionData.selectedObjects.begin(); it != oldObjectsEnd; ++it) {
+ RenderObject* obj = it->key;
</ins><span class="cx"> RenderSelectionInfo* newInfo = newSelectedObjects.get(obj);
</span><del>- RenderSelectionInfo* oldInfo = i->value.get();
</del><ins>+ RenderSelectionInfo* oldInfo = it->value.get();
</ins><span class="cx"> if (!newInfo || oldInfo->rect() != newInfo->rect() || oldInfo->state() != newInfo->state()
</span><del>- || (root.selectionStart() == obj && oldStartPos != root.selectionStartPos())
- || (root.selectionEnd() == obj && oldEndPos != root.selectionEndPos())) {
</del><ins>+ || (root.selectionStart() == obj && oldSelectionData.selectionStartPos != root.selectionStartPos())
+ || (root.selectionEnd() == obj && oldSelectionData.selectionEndPos != root.selectionEndPos())) {
</ins><span class="cx"> oldInfo->repaint();
</span><span class="cx"> if (newInfo) {
</span><span class="cx"> newInfo->repaint();
</span><span class="lines">@@ -1038,16 +1055,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Any new objects that remain were not found in the old objects dict, and so they need to be updated.
</span><del>- SelectedObjectMap::iterator newObjectsEnd = newSelectedObjects.end();
- for (SelectedObjectMap::iterator i = newSelectedObjects.begin(); i != newObjectsEnd; ++i)
- i->value->repaint();
</del><ins>+ auto newObjectsEnd = newSelectedObjects.end();
+ for (auto it = newSelectedObjects.begin(); it != newObjectsEnd; ++it)
+ it->value->repaint();
</ins><span class="cx">
</span><span class="cx"> // Have any of the old blocks changed?
</span><del>- SelectedBlockMap::iterator oldBlocksEnd = oldSelectedBlocks.end();
- for (SelectedBlockMap::iterator i = oldSelectedBlocks.begin(); i != oldBlocksEnd; ++i) {
- RenderBlock* block = i->key;
</del><ins>+ auto oldBlocksEnd = oldSelectionData.selectedBlocks.end();
+ for (auto it = oldSelectionData.selectedBlocks.begin(); it != oldBlocksEnd; ++it) {
+ RenderBlock* block = it->key;
</ins><span class="cx"> RenderBlockSelectionInfo* newInfo = newSelectedBlocks.get(block);
</span><del>- RenderBlockSelectionInfo* oldInfo = i->value.get();
</del><ins>+ RenderBlockSelectionInfo* oldInfo = it->value.get();
</ins><span class="cx"> if (!newInfo || oldInfo->rects() != newInfo->rects() || oldInfo->state() != newInfo->state()) {
</span><span class="cx"> oldInfo->repaint();
</span><span class="cx"> if (newInfo) {
</span><span class="lines">@@ -1058,9 +1075,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Any new blocks that remain were not found in the old blocks dict, and so they need to be updated.
</span><del>- SelectedBlockMap::iterator newBlocksEnd = newSelectedBlocks.end();
- for (SelectedBlockMap::iterator i = newSelectedBlocks.begin(); i != newBlocksEnd; ++i)
- i->value->repaint();
</del><ins>+ auto newBlocksEnd = newSelectedBlocks.end();
+ for (auto it = newSelectedBlocks.begin(); it != newBlocksEnd; ++it)
+ it->value->repaint();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderView::getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -304,7 +304,9 @@
</span><span class="cx"> friend class LayoutStateDisabler;
</span><span class="cx">
</span><span class="cx"> void splitSelectionBetweenSubtrees(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode);
</span><del>- void setSubtreeSelection(SelectionSubtreeRoot&, RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode);
</del><ins>+ void clearSubtreeSelection(const SelectionSubtreeRoot&, SelectionRepaintMode, OldSelectionData&);
+ void updateSelectionForSubtrees(RenderSubtreesMap&, SelectionRepaintMode);
+ void applySubtreeSelection(SelectionSubtreeRoot&, RenderObject* start, RenderObject* end, int endPos, SelectionRepaintMode, const OldSelectionData&);
</ins><span class="cx"> LayoutRect subtreeSelectionBounds(const SelectionSubtreeRoot&, bool clipToVisibleContent = true) const;
</span><span class="cx"> void repaintSubtreeSelection(const SelectionSubtreeRoot&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSelectionSubtreeRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -45,6 +45,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SelectionSubtreeRoot::SelectionSubtreeRoot(RenderObject* selectionStart, int selectionStartPos, RenderObject* selectionEnd, int selectionEndPos)
+ : m_selectionStart(selectionStart)
+ , m_selectionStartPos(selectionStartPos)
+ , m_selectionEnd(selectionEnd)
+ , m_selectionEndPos(selectionEndPos)
+{
+}
+
</ins><span class="cx"> void SelectionSubtreeRoot::adjustForVisibleSelection(Document& document)
</span><span class="cx"> {
</span><span class="cx"> if (selectionClear())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSelectionSubtreeRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h (171675 => 171676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2014-07-28 09:48:44 UTC (rev 171675)
+++ trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2014-07-28 13:19:22 UTC (rev 171676)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #define SelectionSubtreeRoot_h
</span><span class="cx">
</span><span class="cx"> #include "RenderObject.h"
</span><ins>+#include "RenderSelectionInfo.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -38,8 +39,28 @@
</span><span class="cx">
</span><span class="cx"> class SelectionSubtreeRoot {
</span><span class="cx"> public:
</span><ins>+
+ typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectedObjectMap;
+ typedef HashMap<RenderBlock*, std::unique_ptr<RenderBlockSelectionInfo>> SelectedBlockMap;
+ typedef HashMap<SelectionSubtreeRoot*, SelectionSubtreeRoot> RenderSubtreesMap;
</ins><span class="cx">
</span><ins>+ struct OldSelectionData {
+ OldSelectionData()
+ : selectionStartPos(-1)
+ , selectionEndPos(-1)
+ {
+ }
+
+ int selectionStartPos;
+ int selectionEndPos;
+ SelectedObjectMap selectedObjects;
+ SelectedBlockMap selectedBlocks;
+ };
+
+ typedef HashMap<SelectionSubtreeRoot*, std::unique_ptr<OldSelectionData>> SubtreeOldSelectionDataMap;
+
</ins><span class="cx"> SelectionSubtreeRoot();
</span><ins>+ SelectionSubtreeRoot(RenderObject* selectionStart, int selectionStartPos, RenderObject* selectionEnd, int selectionEndPos);
</ins><span class="cx">
</span><span class="cx"> RenderObject* selectionStart() const { return m_selectionStart; }
</span><span class="cx"> int selectionStartPos() const { return m_selectionStartPos; }
</span></span></pre>
</div>
</div>
</body>
</html>