<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171865] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171865">171865</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-07-31 10:24:38 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloaderdownloaderrorexpectedtxt">trunk/LayoutTests/fast/css/fontloader-download-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadereventsexpectedtxt">trunk/LayoutTests/fast/css/fontloader-events-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloaderloadingdoneexpectedtxt">trunk/LayoutTests/fast/css/fontloader-loadingdone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefacesexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefamiliesexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestswebfontfontloaderloadingattributeexpectedtxt">trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/ChangeLog 2014-07-31 17:24:38 UTC (rev 171865)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-31 Bear Travis <betravis@adobe.com>
+
+ [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:
+
</ins><span class="cx"> 2014-07-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Regression tests can't load HTTPS pages with NetworkProcess due to self-signed certificate
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-07-31 17:20:27 UTC (rev 171864)
+++ trunk/LayoutTests/TestExpectations 2014-07-31 17:24:38 UTC (rev 171865)
</span><span class="lines">@@ -132,3 +132,12 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/128736 inspector-protocol/debugger/setBreakpoint-dfg.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/134982 inspector-protocol/debugger/setBreakpoint-dfg-and-modify-local.html [ Failure Pass ]
</span><ins>+
+# 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 ]
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloaderdownloaderrorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-download-error-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+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']
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadereventsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-events-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+PASS event.type is "loading"
+PASS event.type is "loadstart"
+PASS event.type is "load"
+PASS event.type is "loadingdone"
+PASS numberOfEvents is 4
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloaderloadingdoneexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-loadingdone-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,10 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+loadingdone
+PASS window.getComputedStyle(testDiv, 0).width is "48px"
+notifyWhenFontsReady() callback
+PASS window.getComputedStyle(testDiv, 0).width is "48px"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,13 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+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
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,13 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+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
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefamiliesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,13 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+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
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestshttptestswebfontfontloaderloadingattributeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt (171864 => 171865)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL document.fontloader does not exist
</del><ins>+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
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre>
</div>
</div>
</body>
</html>