Merge r174515 - [CSS Font Loading] Decrement the font loading count b…

…efore 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.

Canonical link: https://commits.webkit.org/154760.115@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,12 @@
+2014-10-09  Bear Travis  <betravis@adobe.com>
+
+        [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-08  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Text drawn with an SVG font has no spaces when word-rounding hacks are enabled

Source/WebCore/ChangeLog

@@ -1,3 +1,20 @@
+2014-10-09  Bear Travis  <betravis@adobe.com>
+
+        [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-08  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Text drawn with an SVG font has no spaces when word-rounding hacks are enabled

Source/WebCore/css/FontLoader.cpp

@@ -95,14 +95,15 @@ void LoadFontCallback::notifyLoaded()
     if (m_numLoading)
         return;
 
+    m_fontLoader.loadFontDone(*this);
+
     if (m_errorOccured) {
         if (m_errorCallback)
             m_errorCallback->handleEvent();
     } else {
         if (m_loadCallback)
             m_loadCallback->handleEvent();
     }
-    m_fontLoader.loadFontDone(*this);
 }
 
 void LoadFontCallback::notifyError()