1 files changed, 18 insertions, 26 deletions

diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index 9bc42e0..0dd4013 100644
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 4 -*-
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
@@ -21,9 +20,10 @@
 #ifndef Chrome_h
 #define Chrome_h
 
+#include "FileChooser.h"
 #include "FocusDirection.h"
+#include "HostWindow.h"
 #include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(MAC)
@@ -42,32 +42,24 @@ namespace WebCore {
     class IntRect;
     class Page;
     class String;
-    
+
     struct FrameLoadRequest;
     struct WindowFeatures;
     
-    enum MessageSource {
-        HTMLMessageSource,
-        XMLMessageSource,
-        JSMessageSource,
-        CSSMessageSource,
-        OtherMessageSource
-    };
-
-    enum MessageLevel {
-        TipMessageLevel,
-        LogMessageLevel,
-        WarningMessageLevel,
-        ErrorMessageLevel
-    };
-
-    class Chrome : Noncopyable {
+    class Chrome : public HostWindow {
     public:
         Chrome(Page*, ChromeClient*);
         ~Chrome();
 
         ChromeClient* client() { return m_client; }
 
+        // HostWindow methods.
+        virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
+        virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
+        virtual IntPoint screenToWindow(const IntPoint&) const;
+        virtual IntRect windowToScreen(const IntRect&) const;
+        virtual PlatformWidget platformWindow() const;
+
         void setWindowRect(const FloatRect&) const;
         FloatRect windowRect() const;
 
@@ -102,8 +94,6 @@ namespace WebCore {
         
         void setResizable(bool) const;
 
-        void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
-
         bool canRunBeforeUnloadConfirmPanel();
         bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame);
 
@@ -111,21 +101,23 @@ namespace WebCore {
 
         void runJavaScriptAlert(Frame*, const String&);
         bool runJavaScriptConfirm(Frame*, const String&);
-        bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);                
+        bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
         void setStatusbarText(Frame*, const String&);
         bool shouldInterruptJavaScript();
 
         IntRect windowResizerRect() const;
-        void addToDirtyRegion(const IntRect&);
-        void scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect);
-        void updateBackingStore();
 
         void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
 
         void setToolTip(const HitTestResult&);
 
         void print(Frame*);
-        
+
+        void enableSuddenTermination();
+        void disableSuddenTermination();
+
+        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
+
 #if PLATFORM(MAC)
         void focusNSView(NSView*);
 #endif