[webkit-changes] [126619] branches/safari-536.26-branch/LayoutTests

Fri, 24 Aug 2012 13:26:42 -0700

Title: [126619] branches/safari-536.26-branch/LayoutTests
Revision
126619
Author
jhoneyc...@apple.com
Date
2012-08-24 13:27:18 -0700 (Fri, 24 Aug 2012)

Log Message

2012-08-24  Mark Lam  <mark....@apple.com>

        Re-merge test expectations from r126219. Fixes previous bad merge.
        Patch by Mark Lam. Unreviewed.

        * platform/mac-lion/platform/mac: Added.
        * platform/mac-lion/platform/mac-lion: Removed.
        * platform/mac-lion/platform/mac-lion/platform: Removed.
        * platform/mac-lion/platform/mac-lion/platform/mac: Removed.
        * platform/mac-lion/platform/mac-lion/platform/mac/fast: Removed.
        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text: Removed.
        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Removed.
        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Removed.
        * platform/mac-lion/platform/mac/fast: Added.
        * platform/mac-lion/platform/mac/fast/text: Added.
        * platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Added.
        * platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Added.

Modified Paths

Added Paths

Removed Paths

  • branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac-lion/platform/mac/fast/text/

Diff

Modified: branches/safari-536.26-branch/LayoutTests/ChangeLog (126618 => 126619)


--- branches/safari-536.26-branch/LayoutTests/ChangeLog	2012-08-24 20:22:05 UTC (rev 126618)
+++ branches/safari-536.26-branch/LayoutTests/ChangeLog	2012-08-24 20:27:18 UTC (rev 126619)
@@ -1,3 +1,21 @@
+2012-08-24  Mark Lam  <mark....@apple.com>
+
+        Re-merge test expectations from r126219. Fixes previous bad merge.
+        Patch by Mark Lam. Unreviewed.
+
+        * platform/mac-lion/platform/mac: Added.
+        * platform/mac-lion/platform/mac-lion: Removed.
+        * platform/mac-lion/platform/mac-lion/platform: Removed.
+        * platform/mac-lion/platform/mac-lion/platform/mac: Removed.
+        * platform/mac-lion/platform/mac-lion/platform/mac/fast: Removed.
+        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text: Removed.
+        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Removed.
+        * platform/mac-lion/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Removed.
+        * platform/mac-lion/platform/mac/fast: Added.
+        * platform/mac-lion/platform/mac/fast/text: Added.
+        * platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Added.
+        * platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Added.
+
 2012-08-24  Jon Honeycutt  <jhoneyc...@apple.com>
 
         Update skipped list with changes merged from r121428. Patch by Mark

Added: branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png


(Binary files differ)
Property changes on: branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt (0 => 126619)


--- branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt	                        (rev 0)
+++ branches/safari-536.26-branch/LayoutTests/platform/mac-lion/platform/mac/fast/text/vertical-surrogate-pair-expected.txt	2012-08-24 20:27:18 UTC (rev 126619)
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 253x18
+          text run at (0,0) width 253: "These two glyphs should look the same:"
+      RenderBlock {DIV} at (0,34) size 784x72
+        RenderText {#text} at (0,12) size 48x48
+          text run at (0,12) width 48: "\x{D842}\x{DF9F}"
+      RenderBlock {DIV} at (0,106) size 72x49
+        RenderText {#text} at (12,0) size 48x49
+          text run at (12,0) width 49: "\x{D842}\x{DF9F}"

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to