Diff
Modified: trunk/LayoutTests/ChangeLog (192191 => 192192)
--- trunk/LayoutTests/ChangeLog 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/LayoutTests/ChangeLog 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1,3 +1,16 @@
+2015-11-09 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r192181.
+
+ This change causes asserts on mac-wk1 debug testers
+
+ Reverted changeset:
+
+ "Fixed crash loading Mozilla layout test
+ editor/libeditor/crashtests/431086-1.xhtml."
+ https://bugs.webkit.org/show_bug.cgi?id=150252
+ http://trac.webkit.org/changeset/192181
+
2015-11-09 Jiewen Tan <jiewen_...@apple.com>
Crash when right clicking in input box with -webkit-user-select: none
Deleted: trunk/LayoutTests/editing/execCommand/150252-expected.txt (192191 => 192192)
--- trunk/LayoutTests/editing/execCommand/150252-expected.txt 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/LayoutTests/editing/execCommand/150252-expected.txt 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1 +0,0 @@
-This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252
Deleted: trunk/LayoutTests/editing/execCommand/150252.xhtml (192191 => 192192)
--- trunk/LayoutTests/editing/execCommand/150252.xhtml 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/LayoutTests/editing/execCommand/150252.xhtml 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1,26 +0,0 @@
-<div id="150252" xmlns="http://www.w3.org/1999/xhtml">
-
-<script type="text/_javascript_">
-
-function boom()
-{
- if (window.testRunner)
- testRunner.dumpAsText();
-
- var r = document.documentElement;
- r.style.position = "absolute";
- r.contentEditable = "true";
- r.focus();
- r.contentEditable = "false";
- r.focus();
- r.contentEditable = "true";
- document.execCommand("subscript", false, null);
- r.contentEditable = "false";
- document.getElementById("150252").innerHTML = "This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252";
-}
-
-window.addEventListener("load", boom, false);
-
-</script>
-
-</div>
Deleted: trunk/LayoutTests/editing/execCommand/150252_minimal-expected.txt (192191 => 192192)
--- trunk/LayoutTests/editing/execCommand/150252_minimal-expected.txt 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/LayoutTests/editing/execCommand/150252_minimal-expected.txt 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1 +0,0 @@
-This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252
Deleted: trunk/LayoutTests/editing/execCommand/150252_minimal.xhtml (192191 => 192192)
--- trunk/LayoutTests/editing/execCommand/150252_minimal.xhtml 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/LayoutTests/editing/execCommand/150252_minimal.xhtml 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1,15 +0,0 @@
-<div id="150252" xmlns="http://www.w3.org/1999/xhtml">
-
-<script>
-
-if (window.testRunner)
- testRunner.dumpAsText();
-
-document.documentElement.contentEditable = "true";
-document.documentElement.focus();
-document.execCommand("superscript", false, null);
-document.getElementById("150252").innerHTML = "This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252";
-
-</script>
-
-</div>
Modified: trunk/Source/WebCore/ChangeLog (192191 => 192192)
--- trunk/Source/WebCore/ChangeLog 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/Source/WebCore/ChangeLog 2015-11-10 00:55:28 UTC (rev 192192)
@@ -1,3 +1,16 @@
+2015-11-09 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r192181.
+
+ This change causes asserts on mac-wk1 debug testers
+
+ Reverted changeset:
+
+ "Fixed crash loading Mozilla layout test
+ editor/libeditor/crashtests/431086-1.xhtml."
+ https://bugs.webkit.org/show_bug.cgi?id=150252
+ http://trac.webkit.org/changeset/192181
+
2015-11-09 Jiewen Tan <jiewen_...@apple.com>
Crash when right clicking in input box with -webkit-user-select: none
Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (192191 => 192192)
--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2015-11-10 00:55:28 UTC (rev 192192)
@@ -192,13 +192,13 @@
RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
const Font* result = nullptr;
- if (style) {
+ if (style)
result = &style->fontCascade().primaryFont();
- if (nodeToRemove) {
- ExceptionCode ec;
- nodeToRemove->remove(ec);
- ASSERT(!ec);
- }
+
+ if (nodeToRemove) {
+ ExceptionCode ec;
+ nodeToRemove->remove(ec);
+ ASSERT(!ec);
}
return result;
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (192191 => 192192)
--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2015-11-10 00:44:17 UTC (rev 192191)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2015-11-10 00:55:28 UTC (rev 192192)
@@ -118,12 +118,12 @@
RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
const Font* result = nullptr;
- if (style) {
+ if (style)
result = &style->fontCascade().primaryFont();
- if (nodeToRemove)
- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
- }
+ if (nodeToRemove)
+ nodeToRemove->remove(ASSERT_NO_EXCEPTION);
+
return result;
}
