2007-10-20 Rodney Dawes <dobey@wayofthemonkey.com>

[WebKit-https.git] / WebCore / page / Frame.cpp

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 899e579..9310eba 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -84,7 +84,6 @@
 using namespace std;
 
 using KJS::JSLock;
-using KJS::Window;
 
 namespace WebCore {
 
@@ -194,7 +193,7 @@ Frame::~Frame()
 #endif
 
     if (d->m_jscript && d->m_jscript->haveInterpreter())
-        static_cast<Window*>(d->m_jscript->interpreter()->globalObject())->disconnectFrame();
+        static_cast<KJS::Window*>(d->m_jscript->interpreter()->globalObject())->disconnectFrame();
 
     disconnectOwnerElement();
     
@@ -1765,7 +1764,7 @@ void Frame::pageDestroyed()
 
     // This will stop any JS timers
     if (d->m_jscript && d->m_jscript->haveInterpreter())
-        if (Window* w = Window::retrieveWindow(this))
+        if (KJS::Window* w = KJS::Window::retrieveWindow(this))
             w->disconnectFrame();
 
     d->m_page = 0;