Title: [96950] branches/chromium/874
- Revision
- 96950
- Author
- infe...@chromium.org
- Date
- 2011-10-07 09:45:08 -0700 (Fri, 07 Oct 2011)
Log Message
Merge 96834 - <rdar://problem/10232866> Assertion failure beneath blockSelectionGaps() when a selected node is removed
BUG=99104
Review URL: http://codereview.chromium.org/8200004
Modified Paths
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt (from rev 96834, trunk/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt) (0 => 96950)
--- branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt 2011-10-07 16:45:08 UTC (rev 96950)
@@ -0,0 +1 @@
+
Copied: branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView.html (from rev 96834, trunk/LayoutTests/editing/selection/invalid-in-RenderView.html) (0 => 96950)
--- branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView.html (rev 0)
+++ branches/chromium/874/LayoutTests/editing/selection/invalid-in-RenderView.html 2011-10-07 16:45:08 UTC (rev 96950)
@@ -0,0 +1,21 @@
+<script>
+ var frameset;
+ var topFrame;
+ var selection;
+
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ _onload_ = function()
+ {
+ frameset = document.getElementById("frameset");
+ topFrame = document.getElementById("topFrame");
+ selection = getSelection();
+ selection.setBaseAndExtent(frameset.parentNode, 0, frameset, 4);
+ topFrame.parentNode.removeChild(topFrame);
+ }
+</script>
+<frameset id="frameset">
+ <frame id="topFrame"/>
+ <frame/>
+</frameset>
Modified: branches/chromium/874/Source/WebCore/editing/FrameSelection.cpp (96949 => 96950)
--- branches/chromium/874/Source/WebCore/editing/FrameSelection.cpp 2011-10-07 16:44:42 UTC (rev 96949)
+++ branches/chromium/874/Source/WebCore/editing/FrameSelection.cpp 2011-10-07 16:45:08 UTC (rev 96950)
@@ -1624,7 +1624,7 @@
if (!view)
return;
- VisibleSelection selection = this->selection();
+ VisibleSelection selection(m_selection.visibleStart(), m_selection.visibleEnd());
if (!selection.isRange()) {
view->clearSelection();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
