diff options
author | Patrick Scott <phanna@android.com> | 2009-12-09 08:56:19 -0500 |
---|---|---|
committer | Patrick Scott <phanna@android.com> | 2009-12-09 08:56:19 -0500 |
commit | 85893753155358c7010c212d5a5c651d240b7351 (patch) | |
tree | 0074fb0c831689ac144278bece0f80aede96cb36 /WebCore/loader/FrameLoader.cpp | |
parent | 1d68587ce0a52acb0cb724ac362cee0a14bf1e8f (diff) | |
download | external_webkit-85893753155358c7010c212d5a5c651d240b7351.zip external_webkit-85893753155358c7010c212d5a5c651d240b7351.tar.gz external_webkit-85893753155358c7010c212d5a5c651d240b7351.tar.bz2 |
Pull down change 51321 from webkit.org.
Calls to EventNames() was causing multiple copies of the event names to be
created. This could cause false negatives in hash map lookups.
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
-rw-r--r-- | WebCore/loader/FrameLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 93ada45..98b8e61 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -529,7 +529,7 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic m_unloadEventBeingDispatched = true; if (m_frame->domWindow()) { if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide) - m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(EventNames().pagehideEvent, m_frame->document()->inPageCache()), m_frame->document()); + m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame->document()->inPageCache()), m_frame->document()); #ifndef ANDROID_PAGE_CACHE_UNLOAD if (!m_frame->document()->inPageCache()) #endif @@ -3703,7 +3703,7 @@ void FrameLoader::pageHidden() { m_unloadEventBeingDispatched = true; if (m_frame->domWindow()) - m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(EventNames().pagehideEvent, true), m_frame->document()); + m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, true), m_frame->document()); m_unloadEventBeingDispatched = false; // Send pagehide event for subframes as well |