Mac build fix. Neither me, Sam nor Adam know why we need to do this though :(

        * bindings/js/kjs_proxy.cpp:
        (WebCore::KJSProxy::attachDebugger):
        * page/Page.cpp:
        (WebCore::Page::setDebuggerForAllPages):
        (WebCore::Page::setDebugger):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8ac1c3a999559a23e4abbaefe561f230374f3542..98e8d7211a9836ef89e7a4c60eb15fc6e48cf3f4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-04  Anders Carlsson  <andersca@apple.com>
+
+        Mac build fix. Neither me, Sam nor Adam know why we need to do this though :(
+
+        * bindings/js/kjs_proxy.cpp:
+        (WebCore::KJSProxy::attachDebugger):
+        * page/Page.cpp:
+        (WebCore::Page::setDebuggerForAllPages):
+        (WebCore::Page::setDebugger):
+
 2008-03-04  Adam Roben  <aroben@apple.com>
 
         Make it possible to set a KJS::Debugger on all Frames in a Page and

diff --git a/WebCore/bindings/js/kjs_proxy.cpp b/WebCore/bindings/js/kjs_proxy.cpp
index e3aa03fb5c52eaf103445d2cddd0856435dd5e03..7c58a5ee466061eec5366514aef0ca4da756ca1c 100644 (file)
--- a/WebCore/bindings/js/kjs_proxy.cpp
+++ b/WebCore/bindings/js/kjs_proxy.cpp
@@ -198,14 +198,14 @@ bool KJSProxy::isEnabled()
     return (settings && settings->isJavaScriptEnabled());
 }
 
-void KJSProxy::attachDebugger(Debugger* debugger)
+void KJSProxy::attachDebugger(KJS::Debugger* debugger)
 {
     if (!m_globalObject)
         return;
 
     if (debugger)
         debugger->attach(m_globalObject);
-    else if (Debugger* currentDebugger = m_globalObject->debugger())
+    else if (KJS::Debugger* currentDebugger = m_globalObject->debugger())
         currentDebugger->detach(m_globalObject);
 }
 

diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 59bce205535348c9f02da386d60cebb19c266bfe..b202075a11c34b9439275a3da5fdc12c317ed254 100644 (file)
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -47,8 +47,6 @@
 #include <kjs/JSLock.h>
 #include <wtf/HashMap.h>
 
-using namespace KJS;
-
 namespace WebCore {
 
 static HashSet<Page*>* allPages;
@@ -362,7 +360,7 @@ const String& Page::userStyleSheet() const
     return m_userStyleSheet;
 }
 
-void Page::setDebuggerForAllPages(Debugger* debugger)
+void Page::setDebuggerForAllPages(KJS::Debugger* debugger)
 {
     ASSERT(allPages);
 
@@ -371,7 +369,7 @@ void Page::setDebuggerForAllPages(Debugger* debugger)
         (*it)->setDebugger(debugger);
 }
 
-void Page::setDebugger(Debugger* debugger)
+void Page::setDebugger(KJS::Debugger* debugger)
 {
     if (m_debugger == debugger)
         return;