1 files changed, 12 insertions, 47 deletions

diff --git a/WebCore/page/FramePrivate.h b/WebCore/page/FramePrivate.h
index c780db2..2f7c59a 100644
--- a/WebCore/page/FramePrivate.h
+++ b/WebCore/page/FramePrivate.h
@@ -4,8 +4,8 @@
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
- * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2007 Trolltech ASA
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -29,29 +29,12 @@
 #include "AnimationController.h"
 #include "Editor.h"
 #include "EventHandler.h"
+#include "FrameLoader.h"
 #include "FrameTree.h"
 #include "Range.h"
 #include "SelectionController.h"
 #include "StringHash.h"
-
-namespace KJS {
-    class Interpreter;
-        
-    namespace Bindings {
-        class Instance;
-        class RootObject;
-    }
-}
-
-#if PLATFORM(MAC)
-#ifdef __OBJC__
-@class WebCoreFrameBridge;
-@class WebScriptObject;
-#else
-class WebCoreFrameBridge;
-class WebScriptObject;
-#endif
-#endif
+#include "ScriptController.h"
 
 #if PLATFORM(WIN)
 #include "FrameWin.h"
@@ -62,8 +45,6 @@ namespace WebCore {
 #if FRAME_LOADS_USER_STYLESHEET
     class UserStyleSheetLoader;
 #endif
-
-    typedef HashMap<void*, RefPtr<KJS::Bindings::RootObject> > RootObjectMap;
     
     class FramePrivate {
     public:
@@ -72,18 +53,20 @@ namespace WebCore {
 
         Page* m_page;
         FrameTree m_treeNode;
+        FrameLoader m_loader;
         RefPtr<DOMWindow> m_domWindow;
+        HashSet<DOMWindow*> m_liveFormerWindows;
 
         HTMLFrameOwnerElement* m_ownerElement;
         RefPtr<FrameView> m_view;
         RefPtr<Document> m_doc;
 
-        KJSProxy* m_jscript;
+        ScriptController m_script;
 
         String m_kjsStatusBarText;
         String m_kjsDefaultStatusBarText;
 
-        int m_zoomFactor;
+        float m_zoomFactor;
 
         TextGranularity m_selectionGranularity;
 
@@ -94,40 +77,22 @@ namespace WebCore {
         EventHandler m_eventHandler;
         AnimationController m_animationController;
 
-        bool m_caretVisible : 1;
-        bool m_caretPaint : 1;
-        bool m_isPainting : 1;
-
         RefPtr<CSSMutableStyleDeclaration> m_typingStyle;
 
         Timer<Frame> m_lifeSupportTimer;
 
-        FrameLoader* m_loader;
-        
-        RefPtr<Node> m_elementToDraw;
-        PaintRestriction m_paintRestriction;
+        bool m_caretVisible;
+        bool m_caretPaint;
         
         bool m_highlightTextMatches;
-        
         bool m_inViewSourceMode;
-
-        unsigned frameCount;
-
-        bool m_prohibitsScrolling;
-
         bool m_needsReapplyStyles;
+        bool m_isDisconnected;
+        bool m_excludeFromTextSearch;
 
-        // The root object used for objects bound outside the context of a plugin.
-        RefPtr<KJS::Bindings::RootObject> m_bindingRootObject; 
-        RootObjectMap m_rootObjects;
-        NPObject* m_windowScriptNPObject;
 #if FRAME_LOADS_USER_STYLESHEET
         UserStyleSheetLoader* m_userStyleSheetLoader;
 #endif
-#if PLATFORM(MAC)
-        RetainPtr<WebScriptObject> m_windowScriptObject;
-        WebCoreFrameBridge* m_bridge;
-#endif
     };
 }