Title: [187275] branches/safari-600.1.4.17-branch
- Revision
- 187275
- Author
- [email protected]
- Date
- 2015-07-23 17:23:17 -0700 (Thu, 23 Jul 2015)
Log Message
Roll out r185838. rdar://problem/21708257
Modified Paths
Removed Paths
Diff
Modified: branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog (187274 => 187275)
--- branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-24 00:19:58 UTC (rev 187274)
+++ branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-24 00:23:17 UTC (rev 187275)
@@ -1,5 +1,9 @@
2015-07-23 Babak Shafiei <[email protected]>
+ Roll out r185838.
+
+2015-07-23 Babak Shafiei <[email protected]>
+
Merge r187189.
2015-07-23 Dean Jackson <[email protected]>
Deleted: branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt (187274 => 187275)
--- branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt 2015-07-24 00:19:58 UTC (rev 187274)
+++ branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt 2015-07-24 00:23:17 UTC (rev 187275)
@@ -1,4 +0,0 @@
-foo
-Pass if no crash or assert in debug.
-foobar
-
Deleted: branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html (187274 => 187275)
--- branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html 2015-07-24 00:19:58 UTC (rev 187274)
+++ branches/safari-600.1.4.17-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html 2015-07-24 00:23:17 UTC (rev 187275)
@@ -1,19 +0,0 @@
-<html id="webtest0">
-<head>
-<style>
- :last-child { -webkit-flow-into: foo; }
-</style>
-
-<script>
- if (window.testRunner)
- testRunner.dumpAsText();
- document.write("foo<br>");
-</script>
-</head>
-<body>Pass if no crash or assert in debug.<summary id="webtest5"><mathml><femerge></femerge></mathml>foobar<table></table></summary></body>
-<script>
-document.querySelector("#webtest0").appendChild(document.createElement("canvas"));
-document.execCommand("SelectAll");
-document.getElementById("webtest5").appendChild(document.createElement("feconvolvematrix"));
-</script>
-</html>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187274 => 187275)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-24 00:19:58 UTC (rev 187274)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-24 00:23:17 UTC (rev 187275)
@@ -1,5 +1,9 @@
2015-07-23 Babak Shafiei <[email protected]>
+ Roll out r185838.
+
+2015-07-23 Babak Shafiei <[email protected]>
+
Merge r187189.
2015-07-23 Dean Jackson <[email protected]>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/rendering/SelectionSubtreeRoot.cpp (187274 => 187275)
--- branches/safari-600.1.4.17-branch/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2015-07-24 00:19:58 UTC (rev 187274)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2015-07-24 00:23:17 UTC (rev 187275)
@@ -71,22 +71,15 @@
m_selectionEnd = nullptr;
m_selectionEndPos = -1;
- if (startPos.isNull() || endPos.isNull())
- return;
-
- if (selection.visibleStart() == selection.visibleEnd())
- return;
-
- if (startPos.deprecatedNode()->renderer()->flowThreadContainingBlock() != endPos.deprecatedNode()->renderer()->flowThreadContainingBlock())
- return;
-
- if (&startPos.deprecatedNode()->renderer()->selectionRoot() != this)
- return;
-
- m_selectionStart = startPos.deprecatedNode()->renderer();
- m_selectionStartPos = startPos.deprecatedEditingOffset();
- m_selectionEnd = endPos.deprecatedNode()->renderer();
- m_selectionEndPos = endPos.deprecatedEditingOffset();
+ if (startPos.isNotNull()
+ && endPos.isNotNull()
+ && selection.visibleStart() != selection.visibleEnd()
+ && startPos.deprecatedNode()->renderer()->flowThreadContainingBlock() == endPos.deprecatedNode()->renderer()->flowThreadContainingBlock()) {
+ m_selectionStart = startPos.deprecatedNode()->renderer();
+ m_selectionStartPos = startPos.deprecatedEditingOffset();
+ m_selectionEnd = endPos.deprecatedNode()->renderer();
+ m_selectionEndPos = endPos.deprecatedEditingOffset();
+ }
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
