Title: [104087] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104086 => 104087)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 23:13:30 UTC (rev 104086)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 23:33:06 UTC (rev 104087)
@@ -1,5 +1,18 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 96834
+
+ 2011-10-06 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10232866> Assertion failure beneath blockSelectionGaps() when a selected node is removed
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/selection/invalid-in-RenderView-expected.txt: Added.
+ * editing/selection/invalid-in-RenderView.html: Added.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 96826
2011-10-06 Sergey Glazunov <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt (from rev 96834, trunk/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt) (0 => 104087)
--- branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView-expected.txt 2012-01-04 23:33:06 UTC (rev 104087)
@@ -0,0 +1 @@
+
Copied: branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView.html (from rev 96834, trunk/LayoutTests/editing/selection/invalid-in-RenderView.html) (0 => 104087)
--- branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/editing/selection/invalid-in-RenderView.html 2012-01-04 23:33:06 UTC (rev 104087)
@@ -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/safari-534.54-branch/Source/WebCore/ChangeLog (104086 => 104087)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 23:13:30 UTC (rev 104086)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 23:33:06 UTC (rev 104087)
@@ -1,5 +1,21 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 96834
+
+ 2011-10-06 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10232866> Assertion failure beneath blockSelectionGaps() when a selected node is removed
+
+ Reviewed by Ryosuke Niwa.
+
+ Test: editing/selection/invalid-in-RenderView.html
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::updateAppearance): Ensure that the VisibleSelection used to set the selection
+ in the RenderView is valid, by reconstructing it from the current selection.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 96826
2011-10-06 Sergey Glazunov <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/editing/FrameSelection.cpp (104086 => 104087)
--- branches/safari-534.54-branch/Source/WebCore/editing/FrameSelection.cpp 2012-01-04 23:13:30 UTC (rev 104086)
+++ branches/safari-534.54-branch/Source/WebCore/editing/FrameSelection.cpp 2012-01-04 23:33:06 UTC (rev 104087)
@@ -1648,7 +1648,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
