WebCore:

        Reviewed by Adam.

        Move addMessageToConsole to Chrome.

        * bindings/js/kjs_events.cpp:
        (KJS::JSAbstractEventListener::handleEvent):
        * bindings/js/kjs_proxy.cpp:
        (WebCore::KJSProxy::evaluate):
        * bindings/js/kjs_window.cpp:
        (KJS::Window::isSafeScript):
        (KJS::ScheduledAction::execute):
        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        * bridge/mac/WebCoreFrameBridge.h:
        * page/Chrome.cpp:
        (WebCore::Chrome::addMessageToConsole):
        * page/Chrome.h:
        * page/ChromeClient.h:
        * page/Frame.h:

WebKit:

        Reviewed by Adam.

        Move addMessageToConsole to Chrome.

        * WebCoreSupport/WebChromeClient.h:
        * WebCoreSupport/WebChromeClient.mm:
        (WebChromeClient::addMessageToConsole):
        * WebCoreSupport/WebFrameBridge.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 178646ae525a3329824c4825f8e7116cbc740aa4..dc30a81b88546e9ef983d6abebda6c1204725074 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-11-27  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Move addMessageToConsole to Chrome.
+        
+        * bindings/js/kjs_events.cpp:
+        (KJS::JSAbstractEventListener::handleEvent):
+        * bindings/js/kjs_proxy.cpp:
+        (WebCore::KJSProxy::evaluate):
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::isSafeScript):
+        (KJS::ScheduledAction::execute):
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        * bridge/mac/WebCoreFrameBridge.h:
+        * page/Chrome.cpp:
+        (WebCore::Chrome::addMessageToConsole):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/Frame.h:
+
 2006-11-27  Adele Peterson  <adele@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebCore/bindings/js/kjs_events.cpp b/WebCore/bindings/js/kjs_events.cpp
index d8109f1dcac1c0a9e572ba684ce0fd012bd8b767..8a2125989bae619b6a860c9a79bded66f6f20ac8 100644 (file)
--- a/WebCore/bindings/js/kjs_events.cpp
+++ b/WebCore/bindings/js/kjs_events.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "kjs_events.h"
 
+#include "Chrome.h"
 #include "CString.h"
 #include "Clipboard.h"
 #include "ClipboardEvent.h"
@@ -42,6 +43,7 @@
 #include "MouseEvent.h"
 #include "MutationEvent.h"
 #include "OverflowEvent.h"
+#include "Page.h"
 #include "UIEvent.h"
 #include "WheelEvent.h"
 #include "kjs_proxy.h"
@@ -130,7 +132,8 @@ void JSAbstractEventListener::handleEvent(Event* ele, bool isWindowEvent)
             String sourceURL = exception->get(exec, "sourceURL")->toString(exec);
             if (Interpreter::shouldPrintExceptions())
                 printf("(event handler):%s\n", message.utf8().data());
-            frame->addMessageToConsole(message, lineNumber, sourceURL);
+            if (Page* page = frame->page())
+                page->chrome()->addMessageToConsole(message, lineNumber, sourceURL);
             exec->clearException();
         } else {
             if (!retval->isUndefinedOrNull() && event->storesResultAsString())

diff --git a/WebCore/bindings/js/kjs_proxy.cpp b/WebCore/bindings/js/kjs_proxy.cpp
index 431ef712c5588c3f2d22f937a3e67e2ff3a06641..a3da9610d02e30ae46879281b51159d8406153aa 100644 (file)
--- a/WebCore/bindings/js/kjs_proxy.cpp
+++ b/WebCore/bindings/js/kjs_proxy.cpp
@@ -21,11 +21,13 @@
 #include "config.h"
 #include "kjs_proxy.h"
 
+#include "Chrome.h"
 #include "kjs_events.h"
 #include "kjs_window.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "JSDOMWindow.h"
+#include "Page.h"
 
 #ifdef SVG_SUPPORT
 #include "JSSVGLazyEventListener.h"
@@ -76,7 +78,7 @@ JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String&
     UString errorMessage = comp.value()->toString(m_script->globalExec());
     int lineNumber = comp.value()->toObject(m_script->globalExec())->get(m_script->globalExec(), "line")->toInt32(m_script->globalExec());
     UString sourceURL = comp.value()->toObject(m_script->globalExec())->get(m_script->globalExec(), "sourceURL")->toString(m_script->globalExec());
-    m_frame->addMessageToConsole(errorMessage, lineNumber, sourceURL);
+    m_frame->page()->chrome()->addMessageToConsole(errorMessage, lineNumber, sourceURL);
   }
 
   return 0;

diff --git a/WebCore/bindings/js/kjs_window.cpp b/WebCore/bindings/js/kjs_window.cpp
index 7175e61bb9dfe87674166fe39525134c6fe5ed4f..8556f7b660822d18cb23c08e3724ea383ae6346a 100644 (file)
--- a/WebCore/bindings/js/kjs_window.cpp
+++ b/WebCore/bindings/js/kjs_window.cpp
@@ -1215,7 +1215,8 @@ bool Window::isSafeScript(const ScriptInterpreter *origin, const ScriptInterpret
     }
     String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
                   targetDocument->URL().latin1(), originDocument->URL().latin1());
-    targetFrame->addMessageToConsole(message, 1, String()); //fixme: provide a real line number and sourceurl
+    if (Page* page = targetFrame->page())
+        page->chrome()->addMessageToConsole(message, 1, String()); //fixme: provide a real line number and sourceurl
 
     return false;
 }
@@ -1275,7 +1276,8 @@ bool Window::isSafeScript(ExecState *exec) const
   }
   String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
                   thisDocument->URL().latin1(), actDocument->URL().latin1());
-  m_frame->addMessageToConsole(message, 1, String());
+  if (Page* page = m_frame->page())
+      page->chrome()->addMessageToConsole(message, 1, String());
   
   return false;
 }
@@ -1810,7 +1812,8 @@ void ScheduledAction::execute(Window *window)
                 int lineNumber = exception->get(exec, "line")->toInt32(exec);
                 if (Interpreter::shouldPrintExceptions())
                     printf("(timer):%s\n", message.utf8().data());
-                window->m_frame->addMessageToConsole(message, lineNumber, String());
+                if (Page* page = window->m_frame->page())
+                    page->chrome()->addMessageToConsole(message, lineNumber, String());
             }
         }
     } else

diff --git a/WebCore/bridge/mac/FrameMac.h b/WebCore/bridge/mac/FrameMac.h
index bcdfd21f54c8cdf7d4530cd543be00dff7ba5b80..c1dc6c2e9aca20870f40665bfee8ef6b02b8b8e2 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.h
+++ b/WebCore/bridge/mac/FrameMac.h
@@ -142,8 +142,6 @@ public:
     virtual void focusWindow();
     virtual void unfocusWindow();
 
-    virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
-    
     virtual void runJavaScriptAlert(const String&);
     virtual bool runJavaScriptConfirm(const String&);
     virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 34de02e5ff4b2e50196d2cd7645db3456be7f74c..f2cd311d0654f1ade36ed1f18c9fd2656db96ea3 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -730,16 +730,6 @@ bool FrameMac::shouldInterruptJavaScript()
     return false;
 }
 
-void FrameMac::addMessageToConsole(const String &message, unsigned lineNumber, const String &sourceURL)
-{
-    NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:
-        (NSString *)message, @"message",
-        [NSNumber numberWithInt: lineNumber], @"lineNumber",
-        (NSString *)sourceURL, @"sourceURL",
-        NULL];
-    [_bridge addMessageToConsole:dictionary];
-}
-
 // Returns whether caller should continue with "the default processing", which is the same as 
 // the event handler NOT setting the return value to false
 bool FrameMac::dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy)

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.h b/WebCore/bridge/mac/WebCoreFrameBridge.h
index bb52a7adfb7eab42f174af4bd0f5f4e79469e3ea..459c3b5e3256f6ed22e00cfb4e15951a5f3a5b71 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.h
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.h
@@ -320,7 +320,6 @@ typedef enum {
 - (BOOL)shouldInterruptJavaScript;
 - (BOOL)canRunBeforeUnloadConfirmPanel;
 - (BOOL)runBeforeUnloadConfirmPanelWithMessage:(NSString *)message;
-- (void)addMessageToConsole:(NSDictionary *)message;
 - (void)runOpenPanelForFileButtonWithResultListener:(id <WebCoreOpenPanelResultListener>)resultListener;
 
 - (void)formControlIsBecomingFirstResponder:(NSView *)formControl;

diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index 0920e06ff2890d85c5e6fdbe8cfea93775d6a099..da3bc774fee95256135a8c3e8b59c955c56f478d 100644 (file)
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -170,5 +170,10 @@ void Chrome::setResizable(bool b) const
     m_client->setResizable(b);
 }
 
+void Chrome::addMessageToConsole(const String &message, unsigned lineNumber, const String &sourceURL)
+{
+    m_client->addMessageToConsole(message, lineNumber, sourceURL);
+}
+
 } // namespace WebCore
 

diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index 4d568dfc6b1544a56194461ba71ac5a60eb92bbd..6562370a2930516d0ccebeae45bf4e011dff935f 100644 (file)
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -30,6 +30,7 @@ namespace WebCore {
     class ContextMenu;
     class FloatRect;
     class Page;
+    class String;
     struct FrameLoadRequest;
     
     class Chrome {
@@ -70,6 +71,8 @@ namespace WebCore {
         
         void setResizable(bool) const;
 
+        void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
+        
     private:
         Page* m_page;
         RefPtr<ChromeClient> m_client;

diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index 75040118546f5b3d84aea038e5ed2118c4b2b56b..4f3d2f22ff2221e092b8632623f5218124029026 100644 (file)
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -27,7 +27,8 @@ namespace WebCore {
 
     class FloatRect;
     class Page;
-
+    class String;
+    
     struct FrameLoadRequest;
     
     class ChromeClient : public AbstractShared {
@@ -62,6 +63,8 @@ namespace WebCore {
         virtual bool menubarVisible() = 0;
 
         virtual void setResizable(bool) = 0;
+        
+        virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID) = 0;
 };
 
 }

diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 4fdff3efc14140a6288b01188bc8c8d569c152c4..276ca9783b59f2f7dd07dc8687307f7c0a26d7db 100644 (file)
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -220,8 +220,6 @@ private:
 // === to be moved into Chrome
 
 public:
-    virtual void addMessageToConsole(const String& message,  unsigned int lineNumber, const String& sourceID) = 0;
-
     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;  

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8d07ce63d385cf57d18add59f451e9f005bf4492..343aa895b544d46b8586ac570169a9c371225088 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-27  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Move addMessageToConsole to Chrome.
+
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::addMessageToConsole):
+        * WebCoreSupport/WebFrameBridge.mm:
+
 2006-11-27  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Anders

diff --git a/WebKit/WebCoreSupport/WebChromeClient.h b/WebKit/WebCoreSupport/WebChromeClient.h
index be1a8e6d5294ac87a9520a885a2f07131d611644..bf00703e1bd71c73d3f38be9ab1f7539fb598469 100644 (file)
--- a/WebKit/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/WebCoreSupport/WebChromeClient.h
@@ -72,6 +72,8 @@ public:
     
     virtual void setResizable(bool);
     
+    virtual void addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceID);
+
 private:
     WebChromeClient(WebView *webView);
     

diff --git a/WebKit/WebCoreSupport/WebChromeClient.mm b/WebKit/WebCoreSupport/WebChromeClient.mm
index a15b07d8660e65b5723e637e8a04b7ad1b8d0abc..9924912be33f7d7d4df27960a1936bf87ce28d3a 100644 (file)
--- a/WebKit/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/WebCoreSupport/WebChromeClient.mm
@@ -33,10 +33,12 @@
 #import "WebFrameView.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebUIDelegate.h"
+#import "WebUIDelegatePrivate.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
 #import <WebCore/FloatRect.h>
 #import <WebCore/FrameLoadRequest.h>
+#import <WebCore/PlatformString.h>
 #import <WebCore/ResourceRequestMac.h>
 #import <WebCore/Screen.h>
 #import <wtf/PassRefPtr.h>
@@ -202,3 +204,18 @@ void WebChromeClient::setResizable(bool b)
     [[m_webView _UIDelegateForwarder] webView:m_webView setResizable:b];
 }
 
+void WebChromeClient::addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceURL)
+{
+    id wd = [m_webView UIDelegate];
+    if ([wd respondsToSelector:@selector(webView:addMessageToConsole:)]) {
+        NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+            (NSString *)message, @"message",
+            [NSNumber numberWithInt: lineNumber], @"lineNumber",
+            (NSString *)sourceURL, @"sourceURL",
+            NULL];
+        
+        [wd webView:m_webView addMessageToConsole:dictionary];
+    }    
+}
+
+

diff --git a/WebKit/WebCoreSupport/WebFrameBridge.mm b/WebKit/WebCoreSupport/WebFrameBridge.mm
index ca926b57f6f57d75567e423ef07347f6d582cb42..0941fb620be89d18c5cddfbd76deca8e66720674 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameBridge.mm
+++ b/WebKit/WebCoreSupport/WebFrameBridge.mm
@@ -368,14 +368,6 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     return *result != nil;
 }
 
-- (void)addMessageToConsole:(NSDictionary *)message
-{
-    WebView *wv = [self webView];
-    id wd = [wv UIDelegate];
-    if ([wd respondsToSelector:@selector(webView:addMessageToConsole:)])
-        [wd webView:wv addMessageToConsole:message];
-}
-
 - (void)runOpenPanelForFileButtonWithResultListener:(id<WebCoreOpenPanelResultListener>)resultListener
 {
     WebView *wv = [self webView];