Title: [149835] trunk/LayoutTests/ChangeLog
Revision
149835
Author
[email protected]
Date
2013-05-09 12:41:23 -0700 (Thu, 09 May 2013)

Log Message

Fixing botched rebase of ChangeLog

Modified Paths


Diff

Modified: trunk/LayoutTests/ChangeLog (149834 => 149835)


--- trunk/LayoutTests/ChangeLog	2013-05-09 19:38:23 UTC (rev 149834)
+++ trunk/LayoutTests/ChangeLog	2013-05-09 19:41:23 UTC (rev 149835)
@@ -14,24 +14,6 @@
         (f):
         (run):
 
-<<<<<<< .mine
-2013-05-08  Mark Hahnenberg  <[email protected]>
-
-        DFGArrayMode::fromObserved is too liberal when it sees different Array and NonArray shapes
-        https://bugs.webkit.org/show_bug.cgi?id=115805
-
-        Reviewed by Geoffrey Garen.
-
-        Added regression test for array access over polymorphic array vs. non-array indexing types.
-        With the fix, we get 3.666x faster on this microbenchmark.
-
-        * fast/js/regress/array-nonarray-polymorphic-access-expected.txt: Added.
-        * fast/js/regress/array-nonarray-polymorphic-access.html: Added.
-        * fast/js/regress/script-tests/array-nonarray-polymorhpic-access.js: Added.
-        (f):
-        (run):
-
-=======
 2013-05-09  Radu Stavila  <[email protected]>
 
         [CSSRegions] Change fast/regions/webkit-flow-inlines-inside-regions-bounds[-vertical] tests to make them platform independent
@@ -130,7 +112,6 @@
 
         * platform/qt/fast/js/global-constructors-attributes-expected.txt: Added after r149758.
 
->>>>>>> .r149833
 2013-05-08  Seokju Kwon  <[email protected]>
 
         [EFL] Get rid of duplicate entry line in TestExpectations
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to