editing/undo/undo-after-event-edited.html can be flaky

https://bugs.webkit.org/show_bug.cgi?id=117461

Reviewed by Andreas Kling.

Merge https://chromium.googlesource.com/chromium/blink/+/515de860730b34289df5805b40adb2535a9a8ba1

* editing/undo/undo-after-event-edited.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 58090a19292780b4105a2cc13e98f1a875832be1..cb9c5205d048da3521dbdb2aab414167be87f65e 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2013-06-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        editing/undo/undo-after-event-edited.html can be flaky
+        https://bugs.webkit.org/show_bug.cgi?id=117461
+
+        Reviewed by Andreas Kling.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/515de860730b34289df5805b40adb2535a9a8ba1
+
+        * editing/undo/undo-after-event-edited.html:
+
 2013-06-11  Gabor Abraham  <abrhm@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening. Unskipping passing tests. Generate new baseline where needed.

diff --git a/LayoutTests/editing/undo/undo-after-event-edited.html b/LayoutTests/editing/undo/undo-after-event-edited.html
index a85de581b8f5788b1946007ae0eb7810be300966..c6cd4aa595f34d73b8c91abfc4fca1a05075eef0 100644 (file)
--- a/LayoutTests/editing/undo/undo-after-event-edited.html
+++ b/LayoutTests/editing/undo/undo-after-event-edited.html
@@ -33,11 +33,11 @@ document.addEventListener("DOMCharacterDataModified", function () {
     document.execCommand('InsertParagraph',false,false);
 }, false);
 
-setTimeout(function() {
+window.addEventListener("load", function() {
   document.execCommand("SelectAll", false)
   var documentFragment = getSelection().getRangeAt(0).extractContents();
   document.execCommand('Undo', false);
-}, 1);
+});
 
 </script>
 </head>