Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
index 071b142..4498d36 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
@@ -75,7 +75,6 @@ namespace WebCore {
     class SharedGraphicsContext3D;
     class SpeechInput;
     class SpeechInputClient;
-
 #if ENABLE(DOM_STORAGE)
     class StorageNamespace;
 #endif
@@ -92,6 +91,7 @@ namespace WebCore {
 
     class Page {
         WTF_MAKE_NONCOPYABLE(Page);
+        friend class Settings;
     public:
         static void scheduleForcedStyleRecalcForAllPages();
 
@@ -147,9 +147,6 @@ namespace WebCore {
 
         void goToItem(HistoryItem*, FrameLoadType);
 
-        HistoryItem* globalHistoryItem() const { return m_globalHistoryItem.get(); }
-        void setGlobalHistoryItem(HistoryItem*);
-
         void setGroupName(const String&);
         const String& groupName() const;
 
@@ -298,6 +295,9 @@ namespace WebCore {
 
         MediaCanStartListener* takeAnyMediaCanStartListener();
 
+        void setMinimumTimerInterval(double);
+        double minimumTimerInterval() const;
+
         OwnPtr<Chrome> m_chrome;
         OwnPtr<SelectionController> m_dragCaretController;
 
@@ -332,8 +332,6 @@ namespace WebCore {
         OwnPtr<BackForwardController> m_backForwardController;
         RefPtr<Frame> m_mainFrame;
 
-        RefPtr<HistoryItem> m_globalHistoryItem;
-
         mutable RefPtr<PluginData> m_pluginData;
 
         RefPtr<RenderTheme> m_theme;
@@ -386,6 +384,8 @@ namespace WebCore {
         ViewMode m_viewMode;
 
         ViewportArguments m_viewportArguments;
+
+        double m_minimumTimerInterval;
     };
 
 } // namespace WebCore