Title: [202983] trunk
Revision
202983
Author
[email protected]
Date
2016-07-08 09:42:20 -0700 (Fri, 08 Jul 2016)

Log Message

Unreviewed, rolling out r202945.
https://bugs.webkit.org/show_bug.cgi?id=159565

The test for this change is failing on all platforms.
(Requested by ryanhaddad on #webkit).

Reverted changeset:

"[Font Loading] The callback passed to document.fonts.ready
should always be called"
https://bugs.webkit.org/show_bug.cgi?id=158884
http://trac.webkit.org/changeset/202945

Patch by Commit Queue <[email protected]> on 2016-07-08

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (202982 => 202983)


--- trunk/LayoutTests/ChangeLog	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/ChangeLog	2016-07-08 16:42:20 UTC (rev 202983)
@@ -1,3 +1,18 @@
+2016-07-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r202945.
+        https://bugs.webkit.org/show_bug.cgi?id=159565
+
+        The test for this change is failing on all platforms.
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "[Font Loading] The callback passed to document.fonts.ready
+        should always be called"
+        https://bugs.webkit.org/show_bug.cgi?id=158884
+        http://trac.webkit.org/changeset/202945
+
 2016-07-08  Keith Miller  <[email protected]>
 
         TypedArrays need more isNeutered checks.

Deleted: trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt (202982 => 202983)


--- trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt	2016-07-08 16:42:20 UTC (rev 202983)
@@ -1,11 +0,0 @@
-This test makes sure that document.fonts.ready always triggers its promise when there are no loads.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.fonts.status is "loaded"
-PASS document.fonts.status is "loading"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/fast/text/font-face-set-ready-fire.html (202982 => 202983)


--- trunk/LayoutTests/fast/text/font-face-set-ready-fire.html	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire.html	2016-07-08 16:42:20 UTC (rev 202983)
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script>
-self.jsTestIsAsync = true;
-description("This test makes sure that document.fonts.ready always triggers its promise when there are no loads.")
-
-var counter = 0;
-function bumpCounter() {
-    counter = counter + 1;
-    if (counter == 4)
-        finishJSTest();
-}
-function failure() {
-    testFailed("Promise should not fail.");
-}
-
-document.fonts.ready.then(bumpCounter);
-window.addEventListener("DOMContentLoaded", function() {
-    document.fonts.ready.then(bumpCounter, failure);
-});
-window.addEventListener("load", function() {
-    document.fonts.ready.then(bumpCounter, failure);
-});
-shouldBeEqualToString("document.fonts.status", "loaded");
-document.fonts.add(new FontFace("WebFont", "url('../../resources/Ahem.ttf') format('truetype')", {}));
-document.fonts.load("14px WebFont").then(bumpCounter, failure);
-shouldBeEqualToString("document.fonts.status", "loading");
-</script>
-</head>
-<body>
-<script src=""
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (202982 => 202983)


--- trunk/Source/WebCore/ChangeLog	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/ChangeLog	2016-07-08 16:42:20 UTC (rev 202983)
@@ -1,3 +1,18 @@
+2016-07-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r202945.
+        https://bugs.webkit.org/show_bug.cgi?id=159565
+
+        The test for this change is failing on all platforms.
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "[Font Loading] The callback passed to document.fonts.ready
+        should always be called"
+        https://bugs.webkit.org/show_bug.cgi?id=158884
+        http://trac.webkit.org/changeset/202945
+
 2016-07-08  Nael Ouedraogo  <[email protected]>
 
         ExecState should be passed by reference in JS bindings generator for custom constructors

Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (202982 => 202983)


--- trunk/Source/WebCore/css/FontFaceSet.cpp	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp	2016-07-08 16:42:20 UTC (rev 202983)
@@ -197,7 +197,6 @@
 void FontFaceSet::startedLoading()
 {
     // FIXME: Fire a "loading" event asynchronously.
-    m_isReady = false;
 }
 
 void FontFaceSet::completedLoading()

Modified: trunk/Source/WebCore/css/FontFaceSet.h (202982 => 202983)


--- trunk/Source/WebCore/css/FontFaceSet.h	2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/css/FontFaceSet.h	2016-07-08 16:42:20 UTC (rev 202983)
@@ -111,7 +111,7 @@
     Ref<CSSFontFaceSet> m_backing;
     HashMap<RefPtr<CSSFontFace>, Vector<Ref<PendingPromise>>> m_pendingPromises;
     Optional<ReadyPromise> m_promise;
-    bool m_isReady { true };
+    bool m_isReady { false };
 };
 
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to