Title: [91289] branches/chromium/782/Source/WebCore/html
- Revision
- 91289
- Author
- [email protected]
- Date
- 2011-07-19 12:55:02 -0700 (Tue, 19 Jul 2011)
Log Message
Revert 91204, Merge 90595 BUG=87729
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/html/HTMLLinkElement.cpp (91288 => 91289)
--- branches/chromium/782/Source/WebCore/html/HTMLLinkElement.cpp 2011-07-19 19:49:07 UTC (rev 91288)
+++ branches/chromium/782/Source/WebCore/html/HTMLLinkElement.cpp 2011-07-19 19:55:02 UTC (rev 91289)
@@ -54,7 +54,6 @@
: HTMLElement(tagName, document)
#if ENABLE(LINK_PREFETCH)
, m_onloadTimer(this, &HTMLLinkElement::onloadTimerFired)
- , m_onerrorTimer(this, &HTMLLinkElement::onerrorTimerFired)
#endif
, m_disabledState(Unset)
, m_loading(false)
@@ -447,24 +446,20 @@
void HTMLLinkElement::onloadTimerFired(Timer<HTMLLinkElement>* timer)
{
ASSERT_UNUSED(timer, timer == &m_onloadTimer);
- dispatchEvent(Event::create(eventNames().loadEvent, false, false));
-}
+ if (m_cachedLinkResource->errorOccurred())
+ dispatchEvent(Event::create(eventNames().errorEvent, false, false));
+ else if (!m_cachedLinkResource->wasCanceled())
+ 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));
+ m_cachedLinkResource->removeClient(this);
+ m_cachedLinkResource = 0;
}
void HTMLLinkElement::notifyFinished(CachedResource* resource)
{
ASSERT(m_cachedLinkResource.get() == resource || m_cachedSheet.get() == resource);
- if (m_cachedLinkResource->errorOccurred())
+ if (m_cachedLinkResource.get() == resource)
m_onloadTimer.startOneShot(0);
- else if (!m_cachedLinkResource->wasCanceled())
- m_onerrorTimer.startOneShot(0);
- m_cachedLinkResource->removeClient(this);
- m_cachedLinkResource = 0;
}
#endif
Modified: branches/chromium/782/Source/WebCore/html/HTMLLinkElement.h (91288 => 91289)
--- branches/chromium/782/Source/WebCore/html/HTMLLinkElement.h 2011-07-19 19:49:07 UTC (rev 91288)
+++ branches/chromium/782/Source/WebCore/html/HTMLLinkElement.h 2011-07-19 19:55:02 UTC (rev 91289)
@@ -85,7 +85,6 @@
#if ENABLE(LINK_PREFETCH)
void onloadTimerFired(Timer<HTMLLinkElement>*);
- void onerrorTimerFired(Timer<HTMLLinkElement>*);
#endif
bool checkBeforeLoadEvent();
void process();
@@ -133,7 +132,6 @@
#if ENABLE(LINK_PREFETCH)
CachedResourceHandle<CachedResource> m_cachedLinkResource;
Timer<HTMLLinkElement> m_onloadTimer;
- Timer<HTMLLinkElement> m_onerrorTimer;
#endif
KURL m_url;
String m_type;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
