WebCore:

        Reviewed by Adam.

        Move JavaScript alert and status bar functions to the chrome.
        
        * bindings/js/kjs_window.cpp:
        (KJS::WindowFunc::callAsFunction):
        * page/Chrome.cpp:
        (WebCore::Chrome::runJavaScriptAlert):
        (WebCore::Chrome::runJavaScriptConfirm):
        (WebCore::Chrome::runJavaScriptPrompt):
        (WebCore::Chrome::setStatusBarText):
        * page/Chrome.h:
        * page/ChromeClient.h:
        * page/Frame.cpp:
        (WebCore::Frame::setJSStatusBarText):
        (WebCore::Frame::setJSDefaultStatusBarText):
        * page/Frame.h:
        * page/mac/FrameMac.h:
        * page/mac/FrameMac.mm:
        * page/mac/WebCoreFrameBridge.h:
        * platform/graphics/svg/SVGImageEmptyClients.h:
        (WebCore::SVGEmptyChromeClient::runJavaScriptAlert):
        (WebCore::SVGEmptyChromeClient::runJavaScriptConfirm):
        (WebCore::SVGEmptyChromeClient::runJavaScriptPrompt):
        (WebCore::SVGEmptyChromeClient::setStatusBarText):

WebKit:

        Reviewed by Adam.

        Move functions from the bridge to the chrome client.
        
        * WebCoreSupport/WebChromeClient.h:
        * WebCoreSupport/WebChromeClient.mm:
        (WebChromeClient::runJavaScriptAlert):
        (WebChromeClient::runJavaScriptConfirm):
        (WebChromeClient::runJavaScriptPrompt):
        (WebChromeClient::setStatusBarText):
        * WebCoreSupport/WebFrameBridge.mm:



git-svn-id: svn://svn.chromium.org/blink/trunk@18983 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2007-01-18  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Move JavaScript alert and status bar functions to the chrome.
+        
+        * bindings/js/kjs_window.cpp:
+        (KJS::WindowFunc::callAsFunction):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::runJavaScriptAlert):
+        (WebCore::Chrome::runJavaScriptConfirm):
+        (WebCore::Chrome::runJavaScriptPrompt):
+        (WebCore::Chrome::setStatusBarText):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::setJSStatusBarText):
+        (WebCore::Frame::setJSDefaultStatusBarText):
+        * page/Frame.h:
+        * page/mac/FrameMac.h:
+        * page/mac/FrameMac.mm:
+        * page/mac/WebCoreFrameBridge.h:
+        * platform/graphics/svg/SVGImageEmptyClients.h:
+        (WebCore::SVGEmptyChromeClient::runJavaScriptAlert):
+        (WebCore::SVGEmptyChromeClient::runJavaScriptConfirm):
+        (WebCore::SVGEmptyChromeClient::runJavaScriptPrompt):
+        (WebCore::SVGEmptyChromeClient::setStatusBarText):
+
 2007-01-19  Zack Rusin  <zack@kde.org>
 
         Fix the build.

third_party/WebKit/WebCore/bindings/js/kjs_window.cpp

@@ -1537,7 +1537,8 @@ JSValue *WindowFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const Li
     if (frame && frame->document())
       frame->document()->updateRendering();
     exec->dynamicInterpreter()->pauseTimeoutCheck();
-    frame->runJavaScriptAlert(str);
+    if (page)
+        page->chrome()->runJavaScriptAlert(frame, str);
     exec->dynamicInterpreter()->resumeTimeoutCheck();
     return jsUndefined();
   case Window::AToB:
@@ -1568,7 +1569,9 @@ JSValue *WindowFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const Li
     if (frame && frame->document())
       frame->document()->updateRendering();
     exec->dynamicInterpreter()->pauseTimeoutCheck();
-    bool result = frame->runJavaScriptConfirm(str);
+    bool result = false;
+    if (page)
+        result = page->chrome()->runJavaScriptConfirm(frame, str);
     exec->dynamicInterpreter()->resumeTimeoutCheck();
     return jsBoolean(result);
   }
@@ -1577,11 +1580,10 @@ JSValue *WindowFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const Li
     if (frame && frame->document())
       frame->document()->updateRendering();
     String message = args.size() >= 2 ? args[1]->toString(exec) : UString();
-    bool ok = frame->runJavaScriptPrompt(str, message, str2);
-    if (ok)
+    if (page && page->chrome()->runJavaScriptPrompt(frame, str, message, str2))
         return jsString(str2);
-    else
-        return jsNull();
+
+    return jsNull();
   }
   case Window::Open:
   {

third_party/WebKit/WebCore/page/Chrome.cpp

@@ -23,6 +23,7 @@
 
 #include "ChromeClient.h"
 #include "FloatRect.h"
+#include "Frame.h"
 #include "Page.h"
 #include "ResourceHandle.h"
 #include <wtf/PassRefPtr.h>
@@ -205,5 +206,47 @@ void Chrome::closeWindowSoon()
     m_client->closeWindowSoon();
 }
 
+void Chrome::runJavaScriptAlert(Frame* frame, const String& message)
+{
+    ASSERT(frame);
+    String text = message;
+    text.replace('\\', frame->backslashAsCurrencySymbol());
+    m_client->runJavaScriptAlert(frame, text);
+}
+
+bool Chrome::runJavaScriptConfirm(Frame* frame, const String& message)
+{
+    ASSERT(frame);
+    String text = message;
+    text.replace('\\', frame->backslashAsCurrencySymbol());
+    
+    return m_client->runJavaScriptConfirm(frame, text);
+}
+
+bool Chrome::runJavaScriptPrompt(Frame* frame, const String& prompt, const String& defaultValue, String& result)
+{
+    ASSERT(frame);
+    String promptText = prompt;
+    promptText.replace('\\', frame->backslashAsCurrencySymbol());
+    String defaultValueText = defaultValue;
+    defaultValueText.replace('\\', frame->backslashAsCurrencySymbol());
+    
+    bool ok = m_client->runJavaScriptPrompt(frame, promptText, defaultValueText, result);
+    
+    if (ok)
+        result.replace(frame->backslashAsCurrencySymbol(), '\\');
+    
+    return ok;
+}
+
+void Chrome::setStatusbarText(Frame* frame, const String& status)
+{
+    ASSERT(frame);
+    String text = status;
+    text.replace('\\', frame->backslashAsCurrencySymbol());
+    
+    m_client->setStatusbarText(text);
+}
+
 } // namespace WebCore
 

third_party/WebKit/WebCore/page/Chrome.h

@@ -85,6 +85,10 @@ namespace WebCore {
 
         void closeWindowSoon();
 
+        void runJavaScriptAlert(Frame*, const String&);
+        bool runJavaScriptConfirm(Frame*, const String&);
+        bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);        
+        void setStatusbarText(Frame*, const String&);
     private:
         Page* m_page;
         ChromeClient* m_client;

third_party/WebKit/WebCore/page/ChromeClient.h

@@ -77,6 +77,12 @@ namespace WebCore {
         virtual bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame) = 0;
 
         virtual void closeWindowSoon() = 0;
+        
+        virtual void runJavaScriptAlert(Frame*, const String&) = 0;
+        virtual bool runJavaScriptConfirm(Frame*, const String&) = 0;
+        virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) = 0;
+        virtual void setStatusbarText(const String&) = 0;
+
 };
 
 }

third_party/WebKit/WebCore/page/Frame.cpp

@@ -513,13 +513,15 @@ void Frame::setZoomFactor(int percent)
 void Frame::setJSStatusBarText(const String& text)
 {
     d->m_kjsStatusBarText = text;
-    setStatusBarText(d->m_kjsStatusBarText);
+    if (d->m_page)
+        d->m_page->chrome()->setStatusbarText(this, d->m_kjsStatusBarText);
 }
 
 void Frame::setJSDefaultStatusBarText(const String& text)
 {
     d->m_kjsDefaultStatusBarText = text;
-    setStatusBarText(d->m_kjsDefaultStatusBarText);
+    if (d->m_page)
+        d->m_page->chrome()->setStatusbarText(this, d->m_kjsDefaultStatusBarText);
 }
 
 String Frame::jsStatusBarText() const
@@ -1454,10 +1456,6 @@ void Frame::pageDestroyed()
             w->disconnectFrame();
 }
 
-void Frame::setStatusBarText(const String&)
-{
-}
-
 void Frame::disconnectOwnerElement()
 {
     if (d->m_ownerElement) {

third_party/WebKit/WebCore/page/Frame.h

@@ -204,9 +204,6 @@ private:
 // === to be moved into Chrome
 
 public:
-    virtual void runJavaScriptAlert(const String& message) = 0;
-    virtual bool runJavaScriptConfirm(const String& message) = 0;
-    virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result) = 0;  
     virtual bool shouldInterruptJavaScript() = 0;
     virtual void focusWindow() = 0;
     virtual void unfocusWindow() = 0;
@@ -214,9 +211,6 @@ public:
     bool shouldClose();
     void scheduleClose();
 
-private:
-    virtual void setStatusBarText(const String&);
-
 // === to be moved into Editor
 
 public:

third_party/WebKit/WebCore/page/mac/FrameMac.h

@@ -123,14 +123,9 @@ private:
 // === to be moved into Chrome
 
 public:
-    virtual void setStatusBarText(const String&);
-
     virtual void focusWindow();
     virtual void unfocusWindow();
 
-    virtual void runJavaScriptAlert(const String&);
-    virtual bool runJavaScriptConfirm(const String&);
-    virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);
     virtual bool shouldInterruptJavaScript();    
 
     FloatRect customHighlightLineRect(const AtomicString& type, const FloatRect& lineRect);

third_party/WebKit/WebCore/page/mac/FrameMac.mm

@@ -340,22 +340,6 @@ NSString *FrameMac::matchLabelsAgainstElement(NSArray *labels, Element *element)
     return nil;
 }
 
-void FrameMac::setStatusBarText(const String& status)
-{
-    String text = status;
-    text.replace('\\', backslashAsCurrencySymbol());
-    
-    // We want the temporaries allocated here to be released even before returning to the 
-    // event loop; see <http://bugs.webkit.org/show_bug.cgi?id=9880>.
-    NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
-
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    [_bridge setStatusText:text];
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    [localPool release];
-}
-
 void FrameMac::focusWindow()
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -459,52 +443,6 @@ NPObject *FrameMac::windowScriptNPObject()
     return _windowScriptNPObject;
 }
 
-void FrameMac::runJavaScriptAlert(const String& message)
-{
-    String text = message;
-    text.replace('\\', backslashAsCurrencySymbol());
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    [_bridge runJavaScriptAlertPanelWithMessage:text];
-    END_BLOCK_OBJC_EXCEPTIONS;
-}
-
-bool FrameMac::runJavaScriptConfirm(const String& message)
-{
-    String text = message;
-    text.replace('\\', backslashAsCurrencySymbol());
-
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [_bridge runJavaScriptConfirmPanelWithMessage:text];
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    return false;
-}
-
-bool FrameMac::runJavaScriptPrompt(const String& prompt, const String& defaultValue, String& result)
-{
-    String promptText = prompt;
-    promptText.replace('\\', backslashAsCurrencySymbol());
-    String defaultValueText = defaultValue;
-    defaultValueText.replace('\\', backslashAsCurrencySymbol());
-
-    bool ok;
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    NSString *returnedText = nil;
-
-    ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt
-        defaultText:defaultValue returningText:&returnedText];
-
-    if (ok) {
-        result = String(returnedText);
-        result.replace(backslashAsCurrencySymbol(), '\\');
-    }
-
-    return ok;
-    END_BLOCK_OBJC_EXCEPTIONS;
-    
-    return false;
-}
-
 bool FrameMac::shouldInterruptJavaScript()
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;

third_party/WebKit/WebCore/page/mac/WebCoreFrameBridge.h

@@ -266,8 +266,6 @@ typedef enum ObjectElementType {
 
 - (NSView *)documentView;
 
-- (void)setStatusText:(NSString *)status;
-
 - (WebCore::Frame*)createChildFrameNamed:(NSString *)frameName withURL:(NSURL *)URL referrer:(const WebCore::String&)referrer
     ownerElement:(WebCore::HTMLFrameOwnerElement *)ownerElement allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height;
 
@@ -279,9 +277,6 @@ typedef enum ObjectElementType {
 
 - (BOOL)textViewWasFirstResponderAtMouseDownTime:(NSTextView *)textView;
 
-- (void)runJavaScriptAlertPanelWithMessage:(NSString *)message;
-- (BOOL)runJavaScriptConfirmPanelWithMessage:(NSString *)message;
-- (BOOL)runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText returningText:(NSString **)result;
 - (BOOL)shouldInterruptJavaScript;
 - (void)runOpenPanelForFileButtonWithResultListener:(id <WebCoreOpenPanelResultListener>)resultListener;
 

third_party/WebKit/WebCore/platform/graphics/svg/SVGImageEmptyClients.h

@@ -93,6 +93,11 @@ public:
     virtual bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame) { return true; }
     
     virtual void closeWindowSoon() { }
+    
+    virtual void runJavaScriptAlert(Frame*, const String&) { }
+    virtual bool runJavaScriptConfirm(Frame*, const String&) { return false; }
+    virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) { return false; }
+    virtual void setStatusBarText(const String&) { }
 };
 
 class SVGEmptyFrameLoaderClient : public FrameLoaderClient {

third_party/WebKit/WebKit/ChangeLog

+2007-01-18  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Move functions from the bridge to the chrome client.
+        
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::runJavaScriptAlert):
+        (WebChromeClient::runJavaScriptConfirm):
+        (WebChromeClient::runJavaScriptPrompt):
+        (WebChromeClient::setStatusBarText):
+        * WebCoreSupport/WebFrameBridge.mm:
+
 2007-01-18  Adam Roben  <aroben@apple.com>
 
         Reviewed by Beth.

third_party/WebKit/WebKit/WebCoreSupport/WebChromeClient.h

@@ -80,6 +80,11 @@ public:
 
     virtual void closeWindowSoon();
 
+    virtual void runJavaScriptAlert(WebCore::Frame*, const WebCore::String&);
+    virtual bool runJavaScriptConfirm(WebCore::Frame*, const WebCore::String&);
+    virtual bool runJavaScriptPrompt(WebCore::Frame*, const WebCore::String& message, const WebCore::String& defaultValue, WebCore::String& result);
+    virtual void setStatusBarText(const WebCore::String&);
+
 private:
     WebView *m_webView;
 };

third_party/WebKit/WebKit/WebCoreSupport/WebChromeClient.mm

@@ -267,3 +267,59 @@ void WebChromeClient::closeWindowSoon()
     [m_webView performSelector:@selector(_closeWindow) withObject:nil afterDelay:0.0];
 }
 
+void WebChromeClient::runJavaScriptAlert(Frame* frame, const String& message)
+{
+    id wd = [m_webView UIDelegate];
+    // Check whether delegate implements new version, then whether delegate implements old version. If neither,
+    // fall back to shared delegate's implementation of new version.
+    if ([wd respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)])
+        [wd webView:m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:kit(frame)];
+    else if ([wd respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:)])
+        [wd webView:m_webView runJavaScriptAlertPanelWithMessage:message];
+    else
+        [[WebDefaultUIDelegate sharedUIDelegate] webView:m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:kit(frame)];    
+}
+
+bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
+{
+    id wd = [m_webView UIDelegate];
+    // Check whether delegate implements new version, then whether delegate implements old version. If neither,
+    // fall back to shared delegate's implementation of new version.
+    if ([wd respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)])
+        return [wd webView:m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:kit(frame)];
+    if ([wd respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:)])
+        return [wd webView:m_webView runJavaScriptConfirmPanelWithMessage:message];    
+    return [[WebDefaultUIDelegate sharedUIDelegate] webView:m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:kit(frame)];
+}
+
+bool WebChromeClient::runJavaScriptPrompt(Frame* frame, const String& prompt, const String& defaultText, String& result)
+{
+    id wd = [m_webView UIDelegate];
+    // Check whether delegate implements new version, then whether delegate implements old version. If neither,
+    // fall back to shared delegate's implementation of new version.
+    if ([wd respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)])
+        result = [wd webView:m_webView runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText initiatedByFrame:kit(frame)];
+    else if ([wd respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:)])
+        result = [wd webView:m_webView runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText];
+    else
+        result = [[WebDefaultUIDelegate sharedUIDelegate] webView:m_webView runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText initiatedByFrame:kit(frame)];
+    
+    return !result.isNull();
+}
+
+void WebChromeClient::setStatusBarText(const WebCore::String& status)
+{
+    id wd = [m_webView UIDelegate];
+
+    if ([wd respondsToSelector:@selector(webView:setStatusText:)]) {
+        // We want the temporaries allocated here to be released even before returning to the 
+        // event loop; see <http://bugs.webkit.org/show_bug.cgi?id=9880>.
+        NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
+    
+        [wd webView:m_webView setStatusText:status];
+        
+        [localPool release];
+    }
+}
+
+

third_party/WebKit/WebKit/WebCoreSupport/WebFrameBridge.mm

@@ -286,33 +286,6 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     return [[_frame frameView] window];
 }
 
-- (void)runJavaScriptAlertPanelWithMessage:(NSString *)message
-{
-    WebView *wv = [self webView];
-    id wd = [wv UIDelegate];
-    // Check whether delegate implements new version, then whether delegate implements old version. If neither,
-    // fall back to shared delegate's implementation of new version.
-    if ([wd respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)])
-        [wd webView:wv runJavaScriptAlertPanelWithMessage:message initiatedByFrame:_frame];
-    else if ([wd respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:)])
-        [wd webView:wv runJavaScriptAlertPanelWithMessage:message];
-    else
-        [[WebDefaultUIDelegate sharedUIDelegate] webView:wv runJavaScriptAlertPanelWithMessage:message initiatedByFrame:_frame];
-}
-
-- (BOOL)runJavaScriptConfirmPanelWithMessage:(NSString *)message
-{
-    WebView *wv = [self webView];
-    id wd = [wv UIDelegate];
-    // Check whether delegate implements new version, then whether delegate implements old version. If neither,
-    // fall back to shared delegate's implementation of new version.
-    if ([wd respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)])
-        return [wd webView:wv runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:_frame];
-    if ([wd respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:)])
-        return [wd webView:wv runJavaScriptConfirmPanelWithMessage:message];    
-    return [[WebDefaultUIDelegate sharedUIDelegate] webView:wv runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:_frame];
-}
-
 - (BOOL)shouldInterruptJavaScript
 {
     WebView *wv = [self webView];
@@ -353,13 +326,6 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     return dataSource;
 }
 
-- (void)setStatusText:(NSString *)status
-{
-    ASSERT(_frame != nil);
-    WebView *wv = [self webView];
-    [[wv _UIDelegateForwarder] webView:wv setStatusText:status];
-}
-
 - (void)close
 {
     [super close];