[webkit-changes] [179926] trunk

Wed, 11 Feb 2015 07:34:50 -0800

Title: [179926] trunk
Revision
179926
Author
[email protected]
Date
2015-02-11 07:34:13 -0800 (Wed, 11 Feb 2015)

Log Message

Unreviewed, rolling out r179921.
https://bugs.webkit.org/show_bug.cgi?id=141473

caused about 30 test failures on yosemite and mavericks
(Requested by alexchristensen on #webkit).

Reverted changeset:

"Div having contentEditable and display:flex cannot be edited
if it is empty."
https://bugs.webkit.org/show_bug.cgi?id=141218
http://trac.webkit.org/changeset/179921

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (179925 => 179926)


--- trunk/LayoutTests/ChangeLog	2015-02-11 15:05:06 UTC (rev 179925)
+++ trunk/LayoutTests/ChangeLog	2015-02-11 15:34:13 UTC (rev 179926)
@@ -1,3 +1,18 @@
+2015-02-11  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r179921.
+        https://bugs.webkit.org/show_bug.cgi?id=141473
+
+        caused about 30 test failures on yosemite and mavericks
+        (Requested by alexchristensen on #webkit).
+
+        Reverted changeset:
+
+        "Div having contentEditable and display:flex cannot be edited
+        if it is empty."
+        https://bugs.webkit.org/show_bug.cgi?id=141218
+        http://trac.webkit.org/changeset/179921
+
 2015-02-11  Marcos Chavarría Teijeiro  <[email protected]>
 
         Unreviewed GTK+ Gardening 11 February.

Deleted: trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt (179925 => 179926)


--- trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt	2015-02-11 15:05:06 UTC (rev 179925)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt	2015-02-11 15:34:13 UTC (rev 179926)
@@ -1,7 +0,0 @@
-PASS targetDiv.innerText is "TEST"
-PASS targetDiv.innerText is ""
-PASS targetDiv.innerText is "TEST"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-TEST

Deleted: trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html (179925 => 179926)


--- trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html	2015-02-11 15:05:06 UTC (rev 179925)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html	2015-02-11 15:34:13 UTC (rev 179926)
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<style>
-    #target {
-        display: flex;
-        display: -webkit-flex;
-    }
-</style>
-<script>
-    var targetDiv;
-    function test()
-    {
-        targetDiv = document.getElementById('target');
-        targetDiv.focus();
-
-        // Move cursor to the end of line.
-        getSelection().modify('move', 'forward', 'lineboundary');
-
-        document.execCommand("insertText", false, "EST");
-        shouldBeEqualToString("targetDiv.innerText", "TEST");
-
-        document.execCommand("delete");
-        document.execCommand("delete");
-        document.execCommand("delete");
-        document.execCommand("delete");
-        document.execCommand("delete"); // Remove '\n'
-        shouldBeEmptyString("targetDiv.innerText");
-
-        document.execCommand("insertText", false, "TEST");
-        shouldBeEqualToString("targetDiv.innerText", "TEST");
-    }
-</script>
-</head>
-<body _onload_="test()">
-<div id="target" contentEditable>T</div>
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (179925 => 179926)


--- trunk/Source/WebCore/ChangeLog	2015-02-11 15:05:06 UTC (rev 179925)
+++ trunk/Source/WebCore/ChangeLog	2015-02-11 15:34:13 UTC (rev 179926)
@@ -1,3 +1,18 @@
+2015-02-11  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r179921.
+        https://bugs.webkit.org/show_bug.cgi?id=141473
+
+        caused about 30 test failures on yosemite and mavericks
+        (Requested by alexchristensen on #webkit).
+
+        Reverted changeset:
+
+        "Div having contentEditable and display:flex cannot be edited
+        if it is empty."
+        https://bugs.webkit.org/show_bug.cgi?id=141218
+        http://trac.webkit.org/changeset/179921
+
 2015-02-11  ChangSeok Oh  <[email protected]>
 
         Div having contentEditable and display:flex cannot be edited if it is empty.

Modified: trunk/Source/WebCore/dom/Position.cpp (179925 => 179926)


--- trunk/Source/WebCore/dom/Position.cpp	2015-02-11 15:05:06 UTC (rev 179925)
+++ trunk/Source/WebCore/dom/Position.cpp	2015-02-11 15:34:13 UTC (rev 179926)
@@ -35,7 +35,6 @@
 #include "Logging.h"
 #include "PositionIterator.h"
 #include "RenderBlock.h"
-#include "RenderFlexibleBox.h"
 #include "RenderInline.h"
 #include "RenderIterator.h"
 #include "RenderLineBreak.h"
@@ -935,8 +934,8 @@
 
     if (m_anchorNode->hasTagName(htmlTag))
         return false;
-
-    if (is<RenderBlockFlow>(*renderer) || is<RenderFlexibleBox>(*renderer)) {
+        
+    if (is<RenderBlockFlow>(*renderer)) {
         RenderBlockFlow& block = downcast<RenderBlockFlow>(*renderer);
         if (block.logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
             if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(block))

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to