Changeset 91710 in webkit

Timestamp:

Jul 25, 2011 3:23:50 PM (13 years ago)

Author:

mitz@apple.com

Message:

Reverted r91699 due to
<​http://webkit.org/b/65134> REGRESSION: r91699 broke some font tests (image+text)

Many tests relied on font loading occurring synchronously in the cached and local cases.

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::CSSFontFaceSource):
(WebCore::CSSFontFaceSource::~CSSFontFaceSource):
(WebCore::CSSFontFaceSource::getFontData):

• css/CSSFontFaceSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontFaceSource.cpp (modified) (4 diffs)
• css/CSSFontFaceSource.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-25  Dan Bernstein  <mitz@apple.com>
+
+        Reverted r91699 due to
+        <http://webkit.org/b/65134> REGRESSION: r91699 broke some font tests (image+text)
+
+        Many tests relied on font loading occurring synchronously in the cached and local cases.
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::CSSFontFaceSource):
+        (WebCore::CSSFontFaceSource::~CSSFontFaceSource):
+        (WebCore::CSSFontFaceSource::getFontData):
+        * css/CSSFontFaceSource.h:
+
 2011-06-07  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -51 +51 @@
     , m_font(font)
     , m_face(0)
-    , m_startLoadingTimer(this, &CSSFontFaceSource::startLoadingTimerFired)
 #if ENABLE(SVG_FONTS)
     , m_hasExternalSVGFont(false)
@@ -62 +61 @@
 CSSFontFaceSource::~CSSFontFaceSource()
 {
-    m_startLoadingTimer.stop();
     if (m_font)
         m_font->removeClient(this);
@@ -175 +173 @@
         }
     } else {
-        // Kick off the load now. Do it on a zero-delay timer rather than synchronously, because we may be in
-        // the middle of layout, and the loader may invoke aribtrary delegate or event handler code.
-        m_fontSelector = fontSelector;
-        if (!m_startLoadingTimer.isActive())
-            m_startLoadingTimer.startOneShot(0);
-
+        // Kick off the load now.
+        if (CachedResourceLoader* cachedResourceLoader = fontSelector->cachedResourceLoader())
+            m_font->beginLoadIfNeeded(cachedResourceLoader);
         // FIXME: m_string is a URL so it makes no sense to pass it as a family name.
         SimpleFontData* tempData = fontCache()->getCachedFontData(fontDescription, m_string);
@@ -195 +190 @@
 }
 
-void CSSFontFaceSource::startLoadingTimerFired(Timer<WebCore::CSSFontFaceSource>*)
-{
-    ASSERT(m_font);
-    ASSERT(m_fontSelector);
-
-    if (CachedResourceLoader* cachedResourceLoader = m_fontSelector->cachedResourceLoader())
-        m_font->beginLoadIfNeeded(cachedResourceLoader);
-
-    m_fontSelector = nullptr;
-}
-
 #if ENABLE(SVG_FONTS)
 SVGFontFaceElement* CSSFontFaceSource::svgFontFaceElement() const

trunk/Source/WebCore/css/CSSFontFaceSource.h

@@ -29 +29 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
-#include "Timer.h"
 #include <wtf/HashMap.h>
 #include <wtf/text/AtomicString.h>
@@ -72 +71 @@
 
 private:
-    void startLoadingTimerFired(Timer<CSSFontFaceSource>*);
-
     AtomicString m_string; // URI for remote, built-in font name for local.
     CachedResourceHandle<CachedFont> m_font; // For remote fonts, a pointer to our cached resource.
     CSSFontFace* m_face; // Our owning font face.
     HashMap<unsigned, SimpleFontData*> m_fontDataTable; // The hash key is composed of size synthetic styles.
-
-    Timer<CSSFontFaceSource> m_startLoadingTimer;
-    RefPtr<CSSFontSelector> m_fontSelector;
 
 #if ENABLE(SVG_FONTS)