Merge 69043

WebCore/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 387 matching lines @@
 #if ENABLE(WML)
     , m_containsWMLContent(false)
 #endif
     , m_weakReference(DocumentWeakReference::create(this))
     , m_idAttributeName(idAttr)
 #if ENABLE(FULLSCREEN_API)
     , m_isFullScreen(0)
     , m_areKeysEnabledInFullScreen(0)
 #endif
     , m_loadEventDelayCount(0)
+    , m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
 {
     m_document = this;
 
     m_pageGroupUserSheetCacheValid = false;
 
     m_printing = false;
     m_paginatedForScreen = false;
 
     m_ignoreAutofocus = false;
 
@@ skipping 4350 matching lines @@
     element->dispatchEvent(Event::create(eventNames().webkitfullscreenchangeEvent, true, false));
 }
     
 #endif
 
 void Document::decrementLoadEventDelayCount()
 {
     ASSERT(m_loadEventDelayCount);
     --m_loadEventDelayCount;
 
-    if (frame() && !m_loadEventDelayCount)
+    if (frame() && !m_loadEventDelayCount && !m_loadEventDelayTimer.isActive())
+        m_loadEventDelayTimer.startOneShot(0);
+}
+
+void Document::loadEventDelayTimerFired(Timer<Document>*)
+{
+    if (frame())
         frame()->loader()->checkCompleted();
 }
 
 } // namespace WebCore