Merge "Updates Document::setExtraLayoutDelay to reflect recent submission to webkit.org."

1 files changed, 10 insertions, 9 deletions

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 3d0582c..f2125b1 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -523,6 +523,10 @@ public:
     void setParsing(bool);
     bool parsing() const { return m_bParsing; }
     int minimumLayoutDelay();
+
+    // This method is used by Android.
+    void setExtraLayoutDelay(int delay) { m_extraLayoutDelay = delay; }
+
     bool shouldScheduleLayout();
     int elapsedTime() const;
     
@@ -815,11 +819,6 @@ public:
     void updateFocusAppearanceSoon();
     void cancelFocusAppearanceUpdate();
         
-#ifdef ANDROID_MOBILE
-    void setExtraLayoutDelay(int delay) { mExtraLayoutDelay = delay; }
-    int extraLayoutDelay() { return mExtraLayoutDelay; }
-#endif
-
     // FF method for accessing the selection added for compatability.
     DOMSelection* getSelection() const;
     
@@ -1091,9 +1090,11 @@ private:
     typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair;
     typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap;
     MarkerMap m_markers;
+
 #if !PLATFORM(ANDROID)
     mutable AXObjectCache* m_axObjectCache;
 #endif
+    
     Timer<Document> m_updateFocusAppearanceTimer;
 
     Element* m_cssTarget;
@@ -1103,6 +1104,10 @@ private:
     HashSet<RefPtr<HistoryItem> > m_associatedHistoryItems;
     double m_startTime;
     bool m_overMinimumLayoutThreshold;
+    // This is used to increase the minimum delay between re-layouts. It is set
+    // using setExtraLayoutDelay to modify the minimum delay used at different
+    // points during the lifetime of the Document.
+    int m_extraLayoutDelay;
 
     Vector<std::pair<ScriptElementData*, CachedResourceHandle<CachedScript> > > m_scriptsToExecuteSoon;
     Timer<Document> m_executeScriptSoonTimer;
@@ -1195,10 +1200,6 @@ private:
     
     bool m_usingGeolocation;
 
-#ifdef ANDROID_MOBILE
-    int mExtraLayoutDelay;
-#endif
-
 #if ENABLE(WML)
     bool m_containsWMLContent;
 #endif