Title: [195988] branches/safari-601-branch/LayoutTests

Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195987 => 195988)


--- branches/safari-601-branch/LayoutTests/ChangeLog	2016-02-02 00:20:37 UTC (rev 195987)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2016-02-02 00:32:45 UTC (rev 195988)
@@ -1,31 +1,32 @@
 2016-02-01  Matthew Hanson  <[email protected]>
 
-        Merge r195837. rdar://problem/24002220
+        Merge Layout Tests for r191331. rdar://problem/24448992
 
-    2015-12-22  Pranjal Jumde  <[email protected]>
+    2015-10-19  Myles C. Maxfield  <[email protected]>
 
-            Test to check for stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
-            https://bugs.webkit.org/show_bug.cgi?id=149179
-            <rdar://problem/22708019>.
+            FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+            https://bugs.webkit.org/show_bug.cgi?id=149775
 
-            Reviewed by Dean Jackson.
+            Reviewed by Darin Adler.
 
-            * storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt: Added.
-            * storage/domstorage/localstorage/delete-defineproperty-removal.html: Added.
+            * fast/text/multiple-feature-properties-expected.html: Added.
+            * fast/text/multiple-feature-properties.html: Added.
 
-<<<<<<< .mine
-2016-01-29  Brent Fulgham  <[email protected]>
+2016-02-01  Matthew Hanson  <[email protected]>
 
-        [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
-        https://bugs.webkit.org/show_bug.cgi?id=153643
-        <rdar://problem/23424456>
+        Merge r195837. rdar://problem/24002220
 
-        Reviewed by Dean Jackson.
+    2016-01-29  Brent Fulgham  <[email protected]>
 
-        * fast/canvas/webgl/webgl-drawarrays-crash-expected.txt: Added.
-        * fast/canvas/webgl/webgl-drawarrays-crash.html: Added.
+            [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
+            https://bugs.webkit.org/show_bug.cgi?id=153643
+            <rdar://problem/23424456>
 
-=======
+            Reviewed by Dean Jackson.
+
+            * fast/canvas/webgl/webgl-drawarrays-crash-expected.txt: Added.
+            * fast/canvas/webgl/webgl-drawarrays-crash.html: Added.
+
 2016-01-29  Babak Shafiei  <[email protected]>
 
         Merge r195615.

Added: branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (0 => 195988)


--- branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html	                        (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html	2016-02-02 00:32:45 UTC (rev 195988)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="" The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span>B</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>B</span>
+<span>A</span>
+</div>
+</body>
+</html>

Added: branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html (0 => 195988)


--- branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html	                        (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html	2016-02-02 00:32:45 UTC (rev 195988)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="" The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: common-ligatures; font-feature-settings: 'liga' 0, 'clig' 0;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; font-feature-settings: 'liga' 1, 'clig' 1;">C</span>
+</div>
+</body>
+</html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to