Title: [174515] trunk
- Revision
- 174515
- Author
- [email protected]
- Date
- 2014-10-09 11:43:25 -0700 (Thu, 09 Oct 2014)
Log Message
[CSS Font Loading] Decrement the font loading count before notifying callbacks
https://bugs.webkit.org/show_bug.cgi?id=137401
Reviewed by Alexey Proskuryakov.
Source/WebCore:
In the callbacks, it should appear that font load has completed. This is
accessed through loading(), which relies on the current number of
fonts loading via JS and CSS.
Unskipping the failing test http/tests/webfont/fontloader-loading-attribute.html
test which tests this.
* css/FontLoader.cpp:
(WebCore::LoadFontCallback::notifyLoaded):
LayoutTests:
* platform/mac/TestExpectations: Unskip the test this bug was causing to fail.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (174514 => 174515)
--- trunk/LayoutTests/ChangeLog 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/LayoutTests/ChangeLog 2014-10-09 18:43:25 UTC (rev 174515)
@@ -1,3 +1,12 @@
+2014-10-09 Bear Travis <[email protected]>
+
+ [CSS Font Loading] Decrement the font loading count before notifying callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=137401
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/mac/TestExpectations: Unskip the test this bug was causing to fail.
+
2014-10-09 Simon Fraser <[email protected]>
iOS Simulator results for editing tests.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (174514 => 174515)
--- trunk/LayoutTests/platform/mac/TestExpectations 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-10-09 18:43:25 UTC (rev 174515)
@@ -1361,7 +1361,7 @@
webkit.org/b/135390 fast/css/fontloader-multiple-faces.html [ Pass ]
webkit.org/b/135390 fast/css/fontloader-multiple-families.html [ Pass ]
webkit.org/b/135390 fast/css/fontloader-page-cache.html [ Pass ]
-webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Skip ]
+webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Pass ]
webkit.org/b/136994 http/tests/media/hls/video-cookie.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (174514 => 174515)
--- trunk/Source/WebCore/ChangeLog 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/Source/WebCore/ChangeLog 2014-10-09 18:43:25 UTC (rev 174515)
@@ -1,3 +1,20 @@
+2014-10-09 Bear Travis <[email protected]>
+
+ [CSS Font Loading] Decrement the font loading count before notifying callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=137401
+
+ Reviewed by Alexey Proskuryakov.
+
+ In the callbacks, it should appear that font load has completed. This is
+ accessed through loading(), which relies on the current number of
+ fonts loading via JS and CSS.
+
+ Unskipping the failing test http/tests/webfont/fontloader-loading-attribute.html
+ test which tests this.
+
+ * css/FontLoader.cpp:
+ (WebCore::LoadFontCallback::notifyLoaded):
+
2014-10-09 Chris Dumez <[email protected]>
Unreviewed Windows build fix after r174506.
Modified: trunk/Source/WebCore/css/FontLoader.cpp (174514 => 174515)
--- trunk/Source/WebCore/css/FontLoader.cpp 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2014-10-09 18:43:25 UTC (rev 174515)
@@ -95,6 +95,8 @@
if (m_numLoading)
return;
+ m_fontLoader.loadFontDone(*this);
+
if (m_errorOccured) {
if (m_errorCallback)
m_errorCallback->handleEvent();
@@ -102,7 +104,6 @@
if (m_loadCallback)
m_loadCallback->handleEvent();
}
- m_fontLoader.loadFontDone(*this);
}
void LoadFontCallback::notifyError()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
