Title: [197228] trunk
Revision
197228
Author
[email protected]
Date
2016-02-26 18:59:36 -0800 (Fri, 26 Feb 2016)

Log Message

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

Test simply needs updated result (Requested by litherum on
#webkit).

Reverted changeset:

"Unreviewed, rolling out r197158."
https://bugs.webkit.org/show_bug.cgi?id=154758
http://trac.webkit.org/changeset/197216

Patch by Commit Queue <[email protected]> on 2016-02-26

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (197227 => 197228)


--- trunk/LayoutTests/ChangeLog	2016-02-27 02:53:44 UTC (rev 197227)
+++ trunk/LayoutTests/ChangeLog	2016-02-27 02:59:36 UTC (rev 197228)
@@ -1,3 +1,17 @@
+2016-02-26  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r197216.
+        https://bugs.webkit.org/show_bug.cgi?id=154766
+
+        Test simply needs updated result (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "Unreviewed, rolling out r197158."
+        https://bugs.webkit.org/show_bug.cgi?id=154758
+        http://trac.webkit.org/changeset/197216
+
 2016-02-26  Ryan Haddad  <[email protected]>
 
         Rebaseline tests for ios-simulator after r197162

Modified: trunk/LayoutTests/platform/mac/fast/text/crash-complex-text-surrogate-expected.txt (197227 => 197228)


--- trunk/LayoutTests/platform/mac/fast/text/crash-complex-text-surrogate-expected.txt	2016-02-27 02:53:44 UTC (rev 197227)
+++ trunk/LayoutTests/platform/mac/fast/text/crash-complex-text-surrogate-expected.txt	2016-02-27 02:59:36 UTC (rev 197228)
@@ -1,9 +1,9 @@
 CONSOLE MESSAGE: line 35: TypeError: undefined is not an object (evaluating 'document.forms[0].outerHTML')
-layer at (0,0) size 785x693
+layer at (0,0) size 785x696
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x693
-  RenderBlock {HTML} at (0,0) size 785x693
-    RenderBody {BODY} at (8,8) size 78x677
+layer at (0,0) size 785x696
+  RenderBlock {HTML} at (0,0) size 785x696
+    RenderBody {BODY} at (8,8) size 78x680
       RenderText {#text} at (0,0) size 71x120
         text run at (0,0) width 36: "This"
         text run at (0,15) width 36: "test"
@@ -35,26 +35,26 @@
       RenderBR {BR} at (0,0) size 0x0
       RenderInline {ACRONYM} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,422) size 122x45
+      RenderText {#text} at (0,422) size 118x47
         text run at (0,422) width 45: "s is:"
         text run at (0,437) width 27: "{,}"
-        text run at (0,452) width 122: "\x{A888}{0}P{P}\\7H\\8"
+        text run at (0,454) width 118: "\x{A888}{0}P{P}\\7H\\8"
       RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (0,467) size 71x15
-        text run at (0,467) width 71: "f is: gi"
-      RenderBR {BR} at (70,467) size 1x15
-      RenderText {#text} at (0,482) size 361x195
-        text run at (0,482) width 53: "Errlog"
-        text run at (0,497) width 115: "webtest_fn_4:"
-        text run at (0,512) width 89: "TypeError:"
-        text run at (0,527) width 62: "null is"
-        text run at (0,542) width 53: "not an"
-        text run at (0,557) width 53: "object"
-        text run at (0,572) width 97: "(evaluating"
-        text run at (0,587) width 361: "'document.querySelector(\"plaintext:first-"
-        text run at (0,602) width 62: "of-type"
-        text run at (0,617) width 9: "~"
-        text run at (0,632) width 62: "*|:out-"
-        text run at (0,647) width 27: "of-"
-        text run at (0,662) width 194: "range\").insertBefore')"
+      RenderText {#text} at (0,470) size 71x15
+        text run at (0,470) width 71: "f is: gi"
+      RenderBR {BR} at (70,470) size 1x15
+      RenderText {#text} at (0,485) size 361x195
+        text run at (0,485) width 53: "Errlog"
+        text run at (0,500) width 115: "webtest_fn_4:"
+        text run at (0,515) width 89: "TypeError:"
+        text run at (0,530) width 62: "null is"
+        text run at (0,545) width 53: "not an"
+        text run at (0,560) width 53: "object"
+        text run at (0,575) width 97: "(evaluating"
+        text run at (0,590) width 361: "'document.querySelector(\"plaintext:first-"
+        text run at (0,605) width 62: "of-type"
+        text run at (0,620) width 9: "~"
+        text run at (0,635) width 62: "*|:out-"
+        text run at (0,650) width 27: "of-"
+        text run at (0,665) width 194: "range\").insertBefore')"
       RenderBR {BR} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (197227 => 197228)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2016-02-27 02:53:44 UTC (rev 197227)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2016-02-27 02:59:36 UTC (rev 197228)
@@ -447,5 +447,3 @@
 imported/blink/fast/multicol/vertical-rl/float-big-line.html [ Pass ImageOnlyFailure ]
 imported/blink/fast/multicol/span/adjacent-spanners-with-margin.html [ Pass ImageOnlyFailure ]
 imported/blink/fast/overflow/hidden-html-auto-body.html [ Pass ImageOnlyFailure ]
-
-webkit.org/b/154005 [ ElCapitan+ ] fast/text/crash-complex-text-surrogate.html [ Pass Failure ]

Modified: trunk/Tools/ChangeLog (197227 => 197228)


--- trunk/Tools/ChangeLog	2016-02-27 02:53:44 UTC (rev 197227)
+++ trunk/Tools/ChangeLog	2016-02-27 02:59:36 UTC (rev 197228)
@@ -1,3 +1,17 @@
+2016-02-26  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r197216.
+        https://bugs.webkit.org/show_bug.cgi?id=154766
+
+        Test simply needs updated result (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "Unreviewed, rolling out r197158."
+        https://bugs.webkit.org/show_bug.cgi?id=154758
+        http://trac.webkit.org/changeset/197216
+
 2016-02-26  Alexey Proskuryakov  <[email protected]>
 
         [iOS Simulator] Reftests don't work

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (197227 => 197228)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm	2016-02-27 02:53:44 UTC (rev 197227)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm	2016-02-27 02:59:36 UTC (rev 197228)
@@ -44,6 +44,7 @@
 
     // Work around missing /etc/catalog <rdar://problem/4292995>.
     setenv("XML_CATALOG_FILES", "", 0);
+    setenv("XTYPE_ALLOW_AUTOACTIVATION", "1", 0);
 
     // Language was set up earlier in main(). Don't clobber it.
     NSArray *languages = [[[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain] valueForKey:@"AppleLanguages"];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to