<!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>[171886] trunk</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/171886">171886</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-07-31 14:38:27 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Font Loading] Rename document.fontloader to document.fonts
https://bugs.webkit.org/show_bug.cgi?id=135393
Reviewed by Bem Jones-Bey.
Source/WebCore:
The most recent version of the specification has renamed
document.fontloader to document.fonts. This change updates the
names in WebCore and LayoutTests.
Fixed up existing tests under LayoutTests/fast/css/fontloader-*
and LayoutTests/http/webfont/fontloader-*
* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::notifyFontLoader):
(WebCore::CSSFontFace::notifyLoadingDone):
* dom/Document.cpp:
(WebCore::Document::fonts):
(WebCore::Document::fontloader): Deleted.
* dom/Document.h:
* dom/Document.idl:
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks):
LayoutTests:
Update tests to use the new document.fonts name.
* fast/css/fontloader-download-error.html:
* fast/css/fontloader-events.html:
* fast/css/fontloader-loadingdone.html:
* fast/css/fontloader-multiple-faces-download-error-expected.txt:
* fast/css/fontloader-multiple-faces-download-error.html:
* fast/css/fontloader-multiple-faces-expected.txt:
* fast/css/fontloader-multiple-faces.html:
* fast/css/fontloader-multiple-families-expected.txt:
* fast/css/fontloader-multiple-families.html:
* http/tests/webfont/fontloader-loading-attribute-expected.txt:
* http/tests/webfont/fontloader-loading-attribute.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloaderdownloaderrorhtml">trunk/LayoutTests/fast/css/fontloader-download-error.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadereventshtml">trunk/LayoutTests/fast/css/fontloader-events.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloaderloadingdonehtml">trunk/LayoutTests/fast/css/fontloader-loadingdone.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorhtml">trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefacesexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefaceshtml">trunk/LayoutTests/fast/css/fontloader-multiple-faces.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefamiliesexpectedtxt">trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontloadermultiplefamilieshtml">trunk/LayoutTests/fast/css/fontloader-multiple-families.html</a></li>
<li><a href="#trunkLayoutTestshttptestswebfontfontloaderloadingattributeexpectedtxt">trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestswebfontfontloaderloadingattributehtml">trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/ChangeLog 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-07-31 Bear Travis <betravis@adobe.com>
+
+ [CSS Font Loading] Rename document.fontloader to document.fonts
+ https://bugs.webkit.org/show_bug.cgi?id=135393
+
+ Reviewed by Bem Jones-Bey.
+
+ Update tests to use the new document.fonts name.
+
+ * fast/css/fontloader-download-error.html:
+ * fast/css/fontloader-events.html:
+ * fast/css/fontloader-loadingdone.html:
+ * fast/css/fontloader-multiple-faces-download-error-expected.txt:
+ * fast/css/fontloader-multiple-faces-download-error.html:
+ * fast/css/fontloader-multiple-faces-expected.txt:
+ * fast/css/fontloader-multiple-faces.html:
+ * fast/css/fontloader-multiple-families-expected.txt:
+ * fast/css/fontloader-multiple-families.html:
+ * http/tests/webfont/fontloader-loading-attribute-expected.txt:
+ * http/tests/webfont/fontloader-loading-attribute.html:
+
</ins><span class="cx"> 2014-07-31 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Search highlight is broken in RTL multicolumn content
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloaderdownloaderrorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-download-error.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-download-error.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-download-error.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.addEventListener('loadstart', logEvent);
- document.fontloader.addEventListener('load', logEvent);
- document.fontloader.addEventListener('error', logEvent);
</del><ins>+ document.fonts.addEventListener('loadstart', logEvent);
+ document.fonts.addEventListener('load', logEvent);
+ document.fonts.addEventListener('error', logEvent);
</ins><span class="cx">
</span><del>- document.fontloader.notifyWhenFontsReady(function() {
</del><ins>+ document.fonts.notifyWhenFontsReady(function() {
</ins><span class="cx"> shouldBe("events['myfont1']", "['loadstart', 'error']");
</span><span class="cx"> shouldBe("events['myfont2']", "['loadstart', 'error']");
</span><span class="cx"> shouldBe("events['myfont3']", "['loadstart', 'error']");
</span><span class="lines">@@ -61,10 +61,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadereventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-events.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-events.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-events.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -22,22 +22,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.onloading = handleEvent;
- document.fontloader.onloadingdone = handleEvent;
- document.fontloader.onloadstart = handleEvent;
- document.fontloader.onload = handleEvent;
- document.fontloader.onerror = handleEvent;
</del><ins>+ document.fonts.onloading = handleEvent;
+ document.fonts.onloadingdone = handleEvent;
+ document.fonts.onloadstart = handleEvent;
+ document.fonts.onload = handleEvent;
+ document.fonts.onerror = handleEvent;
</ins><span class="cx">
</span><del>- document.fontloader.notifyWhenFontsReady(function() {
</del><ins>+ document.fonts.notifyWhenFontsReady(function() {
</ins><span class="cx"> shouldBe('numberOfEvents', '4');
</span><span class="cx"> finishJSTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloaderloadingdonehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-loadingdone.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-loadingdone.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-loadingdone.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -22,23 +22,23 @@
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.onloadingdone = function() {
</del><ins>+ document.fonts.onloadingdone = function() {
</ins><span class="cx"> debug('loadingdone');
</span><span class="cx"> testDiv = document.getElementById('test');
</span><span class="cx"> shouldBeEqualToString('window.getComputedStyle(testDiv, 0).width', '48px');
</span><span class="cx"> };
</span><span class="cx">
</span><del>- document.fontloader.notifyWhenFontsReady(function() {
</del><ins>+ document.fonts.notifyWhenFontsReady(function() {
</ins><span class="cx"> debug('notifyWhenFontsReady() callback');
</span><span class="cx"> shouldBeEqualToString('window.getComputedStyle(testDiv, 0).width', '48px');
</span><span class="cx"> finishJSTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error-expected.txt 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PASS events['load'] is 1
</span><span class="cx"> PASS events['error'] is 1
</span><span class="cx"> PASS events['loadingdone'] is undefined
</span><del>-PASS document.fontloader.checkFont('10px TestFont') is false
</del><ins>+PASS document.fonts.checkFont('10px TestFont') is false
</ins><span class="cx"> PASS events['loadingdone'] is 1
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefacesdownloaderrorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.addEventListener('loading', countEvent);
- document.fontloader.addEventListener('loadstart', countEvent);
- document.fontloader.addEventListener('load', countEvent);
- document.fontloader.addEventListener('error', countEvent);
- document.fontloader.addEventListener('loadingdone', countEvent);
</del><ins>+ document.fonts.addEventListener('loading', countEvent);
+ document.fonts.addEventListener('loadstart', countEvent);
+ document.fonts.addEventListener('load', countEvent);
+ document.fonts.addEventListener('error', countEvent);
+ document.fonts.addEventListener('loadingdone', countEvent);
</ins><span class="cx">
</span><del>- document.fontloader.loadFont({ font: '10px TestFont', onsuccess: onsuccess, onerror: onerror });
- document.fontloader.notifyWhenFontsReady(verify);
</del><ins>+ document.fonts.loadFont({ font: '10px TestFont', onsuccess: onsuccess, onerror: onerror });
+ document.fonts.notifyWhenFontsReady(verify);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onsuccess() {
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> shouldBe("events['load']", "1");
</span><span class="cx"> shouldBe("events['error']", "1");
</span><span class="cx"> shouldBe("events['loadingdone']", "undefined");
</span><del>- shouldBe("document.fontloader.checkFont('10px TestFont')", "false");
</del><ins>+ shouldBe("document.fonts.checkFont('10px TestFont')", "false");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function verify() {
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces-expected.txt 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PASS events['load'] is 2
</span><span class="cx"> PASS events['error'] is undefined
</span><span class="cx"> PASS events['loadingdone'] is undefined
</span><del>-PASS document.fontloader.checkFont('10px TestFont') is true
</del><ins>+PASS document.fonts.checkFont('10px TestFont') is true
</ins><span class="cx"> PASS events['loadingdone'] is 1
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefaceshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-faces.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-faces.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-faces.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.addEventListener('loading', countEvent);
- document.fontloader.addEventListener('loadstart', countEvent);
- document.fontloader.addEventListener('load', countEvent);
- document.fontloader.addEventListener('error', countEvent);
- document.fontloader.addEventListener('loadingdone', countEvent);
</del><ins>+ document.fonts.addEventListener('loading', countEvent);
+ document.fonts.addEventListener('loadstart', countEvent);
+ document.fonts.addEventListener('load', countEvent);
+ document.fonts.addEventListener('error', countEvent);
+ document.fonts.addEventListener('loadingdone', countEvent);
</ins><span class="cx">
</span><del>- document.fontloader.loadFont({ font: '10px TestFont', onsuccess: onsuccess, onerror: onerror });
- document.fontloader.notifyWhenFontsReady(verify);
</del><ins>+ document.fonts.loadFont({ font: '10px TestFont', onsuccess: onsuccess, onerror: onerror });
+ document.fonts.notifyWhenFontsReady(verify);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onsuccess() {
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> shouldBe("events['load']", "2");
</span><span class="cx"> shouldBe("events['error']", "undefined");
</span><span class="cx"> shouldBe("events['loadingdone']", "undefined");
</span><del>- shouldBe("document.fontloader.checkFont('10px TestFont')", "true");
</del><ins>+ shouldBe("document.fonts.checkFont('10px TestFont')", "true");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onerror() {
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefamiliesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-families-expected.txt 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PASS events['load'] is 2
</span><span class="cx"> PASS events['error'] is undefined
</span><span class="cx"> PASS events['loadingdone'] is undefined
</span><del>-PASS document.fontloader.checkFont('10px TestFont1, TestFont2') is true
</del><ins>+PASS document.fonts.checkFont('10px TestFont1, TestFont2') is true
</ins><span class="cx"> PASS events['loadingdone'] is 1
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontloadermultiplefamilieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/fontloader-multiple-families.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/fontloader-multiple-families.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/fast/css/fontloader-multiple-families.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- document.fontloader.addEventListener('loading', countEvent);
- document.fontloader.addEventListener('loadstart', countEvent);
- document.fontloader.addEventListener('load', countEvent);
- document.fontloader.addEventListener('error', countEvent);
- document.fontloader.addEventListener('loadingdone', countEvent);
</del><ins>+ document.fonts.addEventListener('loading', countEvent);
+ document.fonts.addEventListener('loadstart', countEvent);
+ document.fonts.addEventListener('load', countEvent);
+ document.fonts.addEventListener('error', countEvent);
+ document.fonts.addEventListener('loadingdone', countEvent);
</ins><span class="cx">
</span><del>- document.fontloader.loadFont({ font: '10px TestFont1, TestFont2', onsuccess: onsuccess, onerror: onerror });
- document.fontloader.notifyWhenFontsReady(verify);
</del><ins>+ document.fonts.loadFont({ font: '10px TestFont1, TestFont2', onsuccess: onsuccess, onerror: onerror });
+ document.fonts.notifyWhenFontsReady(verify);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onsuccess() {
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> shouldBe("events['load']", "2");
</span><span class="cx"> shouldBe("events['error']", "undefined");
</span><span class="cx"> shouldBe("events['loadingdone']", "undefined");
</span><del>- shouldBe("document.fontloader.checkFont('10px TestFont1, TestFont2')", "true");
</del><ins>+ shouldBe("document.fonts.checkFont('10px TestFont1, TestFont2')", "true");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onerror() {
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestswebfontfontloaderloadingattributeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute-expected.txt 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -3,11 +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>-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
</del><ins>+PASS document.fonts.checkFont('10px TestFont') is false
+PASS document.fonts.loading is false
+PASS document.fonts.loading is true
+PASS document.fonts.checkFont('10px TestFont') is true
+PASS document.fonts.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>
<a id="trunkLayoutTestshttptestswebfontfontloaderloadingattributehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute.html (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute.html 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/LayoutTests/http/tests/webfont/fontloader-loading-attribute.html 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -13,22 +13,22 @@
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx">
</span><span class="cx"> function runTests() {
</span><del>- shouldBe("document.fontloader.checkFont('10px TestFont')", "false");
- shouldBe("document.fontloader.loading", "false");
- document.fontloader.loadFont({ font: '10px TestFont', onsuccess: onsuccess });
- shouldBe("document.fontloader.loading", "true");
</del><ins>+ shouldBe("document.fonts.checkFont('10px TestFont')", "false");
+ shouldBe("document.fonts.loading", "false");
+ document.fonts.loadFont({ font: '10px TestFont', onsuccess: onsuccess });
+ shouldBe("document.fonts.loading", "true");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onsuccess() {
</span><del>- shouldBe("document.fontloader.checkFont('10px TestFont')", "true");
- shouldBe("document.fontloader.loading", "false");
</del><ins>+ shouldBe("document.fonts.checkFont('10px TestFont')", "true");
+ shouldBe("document.fonts.loading", "false");
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (document.fontloader)
</del><ins>+if (document.fonts)
</ins><span class="cx"> runTests();
</span><span class="cx"> else {
</span><del>- testFailed('document.fontloader does not exist');
</del><ins>+ testFailed('document.fonts does not exist');
</ins><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/ChangeLog 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-07-31 Bear Travis <betravis@adobe.com>
+
+ [CSS Font Loading] Rename document.fontloader to document.fonts
+ https://bugs.webkit.org/show_bug.cgi?id=135393
+
+ Reviewed by Bem Jones-Bey.
+
+ The most recent version of the specification has renamed
+ document.fontloader to document.fonts. This change updates the
+ names in WebCore and LayoutTests.
+
+ Fixed up existing tests under LayoutTests/fast/css/fontloader-*
+ and LayoutTests/http/webfont/fontloader-*
+
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::notifyFontLoader):
+ (WebCore::CSSFontFace::notifyLoadingDone):
+ * dom/Document.cpp:
+ (WebCore::Document::fonts):
+ (WebCore::Document::fontloader): Deleted.
+ * dom/Document.h:
+ * dom/Document.idl:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks):
+
</ins><span class="cx"> 2014-07-31 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Search highlight is broken in RTL multicolumn content
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -156,13 +156,13 @@
</span><span class="cx">
</span><span class="cx"> switch (newState) {
</span><span class="cx"> case Loading:
</span><del>- document->fontloader()->beginFontLoading(m_rule.get());
</del><ins>+ document->fonts()->beginFontLoading(m_rule.get());
</ins><span class="cx"> break;
</span><span class="cx"> case Loaded:
</span><del>- document->fontloader()->fontLoaded(m_rule.get());
</del><ins>+ document->fonts()->fontLoaded(m_rule.get());
</ins><span class="cx"> break;
</span><span class="cx"> case Error:
</span><del>- document->fontloader()->loadError(m_rule.get(), m_activeSource);
</del><ins>+ document->fonts()->loadError(m_rule.get(), m_activeSource);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> {
</span><span class="cx"> Document* document = (*m_segmentedFontFaces.begin())->fontSelector()->document();
</span><span class="cx"> if (document)
</span><del>- document->fontloader()->loadingDone();
</del><ins>+ document->fonts()->loadingDone();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -6074,7 +6074,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><del>-PassRefPtr<FontLoader> Document::fontloader()
</del><ins>+PassRefPtr<FontLoader> Document::fonts()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_fontloader)
</span><span class="cx"> m_fontloader = FontLoader::create(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/dom/Document.h 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx"> virtual SecurityOrigin* topOrigin() const override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><del>- PassRefPtr<FontLoader> fontloader();
</del><ins>+ PassRefPtr<FontLoader> fonts();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void ensurePlugInsInjectedScript(DOMWrapperWorld&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/dom/Document.idl 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> [Conditional=CSS_REGIONS] DOMNamedFlowCollection webkitGetNamedFlows();
</span><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- [Conditional=FONT_LOAD_EVENTS] readonly attribute FontLoader fontloader;
</del><ins>+ [Conditional=FONT_LOAD_EVENTS] readonly attribute FontLoader fonts;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C) && (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (171885 => 171886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-07-31 21:00:45 UTC (rev 171885)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-07-31 21:38:27 UTC (rev 171886)
</span><span class="lines">@@ -2831,7 +2831,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().fontLoadEventsEnabled())
</span><del>- frame().document()->fontloader()->didLayout();
</del><ins>+ frame().document()->fonts()->didLayout();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: We should consider adding DidLayout as a LayoutMilestone. That would let us merge this
</span></span></pre>
</div>
</div>
</body>
</html>