Changeset 91204 in webkit

Timestamp:

Jul 18, 2011, 1:20:25 PM (14 years ago)

Author:

gavinp@chromium.org

Message:

Merge 89719 BUG=80729

Location:

branches/chromium/782/Source/WebCore/html

Files:

• HTMLLinkElement.cpp (modified) (2 diffs)
• HTMLLinkElement.h (modified) (2 diffs)

branches/chromium/782/Source/WebCore/html/HTMLLinkElement.cpp

@@ -55 +55 @@
 #if ENABLE(LINK_PREFETCH)
     , m_onloadTimer(this, &HTMLLinkElement::onloadTimerFired)
+    , m_onerrorTimer(this, &HTMLLinkElement::onerrorTimerFired)
 #endif
     , m_disabledState(Unset)
@@ -447 +448 @@
 {
     ASSERT_UNUSED(timer, timer == &m_onloadTimer);
+    dispatchEvent(Event::create(eventNames().loadEvent, false, false));
+}
+
+void HTMLLinkElement::onerrorTimerFired(Timer<HTMLLinkElement>* timer)
+{
+    ASSERT_UNUSED(timer, timer == &m_onerrorTimer);
+    dispatchEvent(Event::create(eventNames().errorEvent, false, false));
+}
+
+void HTMLLinkElement::notifyFinished(CachedResource* resource)
+{
+    ASSERT(m_cachedLinkResource.get() == resource || m_cachedSheet.get() == resource);
     if (m_cachedLinkResource->errorOccurred())
-        dispatchEvent(Event::create(eventNames().errorEvent, false, false));
+        m_onloadTimer.startOneShot(0);
     else if (!m_cachedLinkResource->wasCanceled())
-        dispatchEvent(Event::create(eventNames().loadEvent, false, false));
-
+        m_onerrorTimer.startOneShot(0);
     m_cachedLinkResource->removeClient(this);
     m_cachedLinkResource = 0;
-}
-
-void HTMLLinkElement::notifyFinished(CachedResource* resource)
-{
-    ASSERT(m_cachedLinkResource.get() == resource || m_cachedSheet.get() == resource);
-    if (m_cachedLinkResource.get() == resource)
-        m_onloadTimer.startOneShot(0);
 }
 #endif

branches/chromium/782/Source/WebCore/html/HTMLLinkElement.h

@@ -86 +86 @@
 #if ENABLE(LINK_PREFETCH)
     void onloadTimerFired(Timer<HTMLLinkElement>*);
+    void onerrorTimerFired(Timer<HTMLLinkElement>*);
 #endif
     bool checkBeforeLoadEvent();
@@ -133 +134 @@
     CachedResourceHandle<CachedResource> m_cachedLinkResource;
     Timer<HTMLLinkElement> m_onloadTimer;
+    Timer<HTMLLinkElement> m_onerrorTimer;
 #endif
     KURL m_url;