Merge 69043

WebCore/dom/Document.h

 /*
  * 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, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1043 matching lines @@
     void updateFocusAppearanceTimerFired(Timer<Document>*);
     void updateBaseURL();
 
     void cacheDocumentElement() const;
 
     void createStyleSelector();
 
     void pendingEventTimerFired(Timer<Document>*);
 
     PassRefPtr<NodeList> handleZeroPadding(const HitTestRequest&, HitTestResult&) const;
+    
+    void loadEventDelayTimerFired(Timer<Document>*);
 
     OwnPtr<CSSStyleSelector> m_styleSelector;
     bool m_didCalculateStyleSelector;
 
     Frame* m_frame;
     OwnPtr<DocLoader> m_docLoader;
     RefPtr<DocumentParser> m_parser;
     bool m_wellFormed;
 
     // Document URLs.
@@ skipping 222 matching lines @@
 
     QualifiedName m_idAttributeName;
     
 #if ENABLE(FULLSCREEN_API)
     bool m_isFullScreen;
     bool m_areKeysEnabledInFullScreen;
     RefPtr<Element> m_fullScreenElement;
 #endif
 
     int m_loadEventDelayCount;
+    Timer<Document> m_loadEventDelayTimer;
 };
 
 inline bool Document::hasElementWithId(AtomicStringImpl* id) const
 {
     ASSERT(id);
     return m_elementsById.contains(id) || m_duplicateIds.contains(id);
 }
     
 inline bool Node::isDocumentNode() const
 {
@@ skipping 11 matching lines @@
     if (m_document)
         m_document->selfOnlyRef();
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();
 #endif
 }
 
 } // namespace WebCore
 
 #endif // Document_h