Diff
Modified: trunk/LayoutTests/ChangeLog (171864 => 171865)
--- trunk/LayoutTests/ChangeLog 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/ChangeLog 2014-07-31 17:24:38 UTC (rev 171865)
@@ -1,3 +1,22 @@
+2014-07-31 Bear Travis <[email protected]>
+
+ [CSS Font Loading] Test expectations should show success
+ https://bugs.webkit.org/show_bug.cgi?id=135420
+
+ Reviewed by Bem Jones-Bey.
+
+ Modify the expected files to represent success, and skip
+ the tests until the feature is enabled.
+
+ * TestExpectations: Skip the tests.
+ * fast/css/fontloader-download-error-expected.txt:
+ * fast/css/fontloader-events-expected.txt:
+ * fast/css/fontloader-loadingdone-expected.txt:
+ * fast/css/fontloader-multiple-faces-download-error-expected.txt:
+ * fast/css/fontloader-multiple-faces-expected.txt:
+ * fast/css/fontloader-multiple-families-expected.txt:
+ * http/tests/webfont/fontloader-loading-attribute-expected.txt:
+
2014-07-31 Dan Bernstein <[email protected]>
[WK2] Regression tests can't load HTTPS pages with NetworkProcess due to self-signed certificate
Modified: trunk/LayoutTests/TestExpectations (171864 => 171865)
--- trunk/LayoutTests/TestExpectations 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/TestExpectations 2014-07-31 17:24:38 UTC (rev 171865)
@@ -132,3 +132,12 @@
webkit.org/b/128736 inspector-protocol/debugger/setBreakpoint-dfg.html [ Failure Pass ]
webkit.org/b/134982 inspector-protocol/debugger/setBreakpoint-dfg-and-modify-local.html [ Failure Pass ]
+
+# CSS Font Loading is not yet enabled on all platforms
+webkit.org/b/135390 fast/css/fontloader-download-error.html [ Skip ]
+webkit.org/b/135390 fast/css/fontloader-events.html [ Skip ]
+webkit.org/b/135390 fast/css/fontloader-loadingdone.html [ Skip ]
+webkit.org/b/135390 fast/css/fontloader-multiple-faces-download-error.html [ Skip ]
+webkit.org/b/135390 fast/css/fontloader-multiple-faces.html [ Skip ]
+webkit.org/b/135390 fast/css/fontloader-multiple-families.html [ Skip ]
+webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Skip ]
Modified: trunk/LayoutTests/fast/css/fontloader-download-error-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-download-error-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-download-error-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,11 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS events['myfont1'] is ['loadstart', 'error']
+PASS events['myfont2'] is ['loadstart', 'error']
+PASS events['myfont3'] is ['loadstart', 'error']
+PASS events['myfont4'] is ['loadstart', 'load']
+PASS events['myfont5'] is ['loadstart', 'error']
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/css/fontloader-events-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-events-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-events-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,11 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS event.type is "loading"
+PASS event.type is "loadstart"
+PASS event.type is "load"
+PASS event.type is "loadingdone"
+PASS numberOfEvents is 4
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/css/fontloader-loadingdone-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-loadingdone-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-loadingdone-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,10 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+loadingdone
+PASS window.getComputedStyle(testDiv, 0).width is "48px"
+notifyWhenFontsReady() callback
+PASS window.getComputedStyle(testDiv, 0).width is "48px"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,13 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS events['loading'] is 1
+PASS events['loadstart'] is 2
+PASS events['load'] is 1
+PASS events['error'] is 1
+PASS events['loadingdone'] is undefined
+PASS document.fontloader.checkFont('10px TestFont') is false
+PASS events['loadingdone'] is 1
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,13 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS events['loading'] is 1
+PASS events['loadstart'] is 2
+PASS events['load'] is 2
+PASS events['error'] is undefined
+PASS events['loadingdone'] is undefined
+PASS document.fontloader.checkFont('10px TestFont') is true
+PASS events['loadingdone'] is 1
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt (171864 => 171865)
--- trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,13 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS events['loading'] is 1
+PASS events['loadstart'] is 2
+PASS events['load'] is 2
+PASS events['error'] is undefined
+PASS events['loadingdone'] is undefined
+PASS document.fontloader.checkFont('10px TestFont1, TestFont2') is true
+PASS events['loadingdone'] is 1
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt (171864 => 171865)
--- trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt 2014-07-31 17:24:38 UTC (rev 171865)
@@ -3,7 +3,11 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-FAIL document.fontloader does not exist
+PASS document.fontloader.checkFont('10px TestFont') is false
+PASS document.fontloader.loading is false
+PASS document.fontloader.loading is true
+PASS document.fontloader.checkFont('10px TestFont') is true
+PASS document.fontloader.loading is false
PASS successfullyParsed is true
TEST COMPLETE
