Changeset 28794 in webkit

Timestamp:

Dec 16, 2007 8:50:53 PM (16 years ago)

Author:

weinig@apple.com

Message:

Reviewed by Maciej.

Yet more of ​http://bugs.webkit.org/show_bug.cgi?id=16385
Cleanup kjs_window

• Move ScheduledAction into its own file and put it in the WebCore namespace.

• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• WebCoreSources.bkl:
• bindings/js/PausedTimeouts.cpp:
• bindings/js/PausedTimeouts.h:
• bindings/js/ScheduledAction.cpp: Copied from bindings/js/kjs_window.cpp. (WebCore::ScheduledAction::ScheduledAction): (WebCore::ScheduledAction::execute):
• bindings/js/ScheduledAction.h: Copied from bindings/js/kjs_window.h. (WebCore::ScheduledAction::ScheduledAction):
• bindings/js/kjs_window.cpp: (KJS::DOMWindowTimer::DOMWindowTimer): (KJS::DOMWindowTimer::action): (KJS::DOMWindowTimer::takeAction): (KJS::Window::installTimeout): (KJS::Window::timerFired):
• bindings/js/kjs_window.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCoreSources.bkl (modified) (1 diff)
• bindings/js/PausedTimeouts.cpp (modified) (1 diff)
• bindings/js/PausedTimeouts.h (modified) (2 diffs)
• bindings/js/ScheduledAction.cpp (copied) (copied from trunk/WebCore/bindings/js/kjs_window.cpp) (4 diffs)
• bindings/js/ScheduledAction.h (copied) (copied from trunk/WebCore/bindings/js/kjs_window.h) (2 diffs)
• bindings/js/kjs_window.cpp (modified) (8 diffs)
• bindings/js/kjs_window.h (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-16  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Maciej.
+
+        Yet more of http://bugs.webkit.org/show_bug.cgi?id=16385
+        Cleanup kjs_window
+
+        - Move ScheduledAction into its own file and put it in the WebCore namespace.
+
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/PausedTimeouts.cpp:
+        * bindings/js/PausedTimeouts.h:
+        * bindings/js/ScheduledAction.cpp: Copied from bindings/js/kjs_window.cpp.
+        (WebCore::ScheduledAction::ScheduledAction):
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScheduledAction.h: Copied from bindings/js/kjs_window.h.
+        (WebCore::ScheduledAction::ScheduledAction):
+        * bindings/js/kjs_window.cpp:
+        (KJS::DOMWindowTimer::DOMWindowTimer):
+        (KJS::DOMWindowTimer::action):
+        (KJS::DOMWindowTimer::takeAction):
+        (KJS::Window::installTimeout):
+        (KJS::Window::timerFired):
+        * bindings/js/kjs_window.h:
+
 2007-12-16  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/WebCore.pro

@@ -420 +420 @@
     bindings/js/kjs_window.cpp \
     bindings/js/PausedTimeouts.cpp \
+    bindings/js/ScheduledAction.cpp \
     css/CSSBorderImageValue.cpp \
     css/CSSCharsetRule.cpp \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -7648 +7648 @@
                                         >
                                 </File>
+                                <File
+                                        RelativePath="..\bindings\js\ScheduledAction.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\bindings\js\ScheduledAction.h"
+                                        >
+                                </File>
                         </Filter>
                 </Filter>

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3644 +3644 @@
                 BCA378160D15C64600B793D6 /* PausedTimeouts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378140D15C64600B793D6 /* PausedTimeouts.cpp */; };
                 BCA378170D15C64600B793D6 /* PausedTimeouts.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378150D15C64600B793D6 /* PausedTimeouts.h */; };
+                BCA378BC0D15F64200B793D6 /* ScheduledAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */; };
+                BCA378BD0D15F64200B793D6 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; };
                 BCA85A100C3AEAF4006F8308 /* DOMSVGNumberInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA85A0F0C3AEAF4006F8308 /* DOMSVGNumberInternal.h */; };
                 BCAA90C30A7EBA60008B1229 /* ScrollBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAA90C20A7EBA60008B1229 /* ScrollBar.cpp */; };
@@ -7655 +7657 @@
                 BCA378140D15C64600B793D6 /* PausedTimeouts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PausedTimeouts.cpp; sourceTree = "<group>"; };
                 BCA378150D15C64600B793D6 /* PausedTimeouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PausedTimeouts.h; sourceTree = "<group>"; };
+                BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScheduledAction.cpp; sourceTree = "<group>"; };
+                BCA378BB0D15F64200B793D6 /* ScheduledAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScheduledAction.h; sourceTree = "<group>"; };
                 BCA85A0F0C3AEAF4006F8308 /* DOMSVGNumberInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGNumberInternal.h; sourceTree = "<group>"; };
                 BCAA90C20A7EBA60008B1229 /* ScrollBar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ScrollBar.cpp; path = platform/ScrollBar.cpp; sourceTree = SOURCE_ROOT; };
@@ -11410 +11414 @@
                                 BCA378140D15C64600B793D6 /* PausedTimeouts.cpp */,
                                 BCA378150D15C64600B793D6 /* PausedTimeouts.h */,
+                                BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
+                                BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
                         );
                         path = js;
@@ -14107 +14113 @@
                                 B28BC31A0D135E5400CDBA27 /* JSEventTargetBase.lut.h in Headers */,
                                 BCA378170D15C64600B793D6 /* PausedTimeouts.h in Headers */,
+                                BCA378BD0D15F64200B793D6 /* ScheduledAction.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -15819 +15826 @@
                                 BC4BF9E40D11E133007D247F /* ClassNames.cpp in Sources */,
                                 BCA378160D15C64600B793D6 /* PausedTimeouts.cpp in Sources */,
+                                BCA378BC0D15F64200B793D6 /* ScheduledAction.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/WebCoreSources.bkl

@@ -94 +94 @@
         bindings/js/kjs_window.cpp
         bindings/js/PausedTimeouts.cpp
+        bindings/js/ScheduledAction.cpp
     </set>
     

trunk/WebCore/bindings/js/PausedTimeouts.cpp

@@ -24 +24 @@
 #include "PausedTimeouts.h"
 
-#include "kjs_window.h"
+#include "ScheduledAction.h"
 
 namespace WebCore {

trunk/WebCore/bindings/js/PausedTimeouts.h

@@ -23 +23 @@
 #include <wtf/Noncopyable.h>
 
-namespace KJS {
+namespace WebCore {
+
     class ScheduledAction;
-}
-
-namespace WebCore {
 
     struct PausedTimeout {
@@ -34 +32 @@
         double nextFireInterval;
         double repeatInterval;
-        KJS::ScheduledAction* action;
+        ScheduledAction* action;
     };
 

trunk/WebCore/bindings/js/ScheduledAction.cpp

@@ -1 @@
-// -*- c-basic-offset: 4 -*-
 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
@@ -23 +22 @@
 
 #include "config.h"
-#include "kjs_window.h"
+#include "ScheduledAction.h"
 
-#include "Base64.h"
 #include "CString.h"
 #include "Chrome.h"
 #include "DOMWindow.h"
-#include "Element.h"
-#include "EventListener.h"
-#include "EventNames.h"
-#include "ExceptionCode.h"
-#include "FloatRect.h"
+#include "Document.h"
 #include "Frame.h"
-#include "FrameLoadRequest.h"
 #include "FrameLoader.h"
-#include "FrameTree.h"
-#include "GCController.h"
-#include "HTMLDocument.h"
-#include "JSDOMExceptionConstructor.h"
-#include "JSDOMWindow.h"
-#include "JSEvent.h"
-#include "JSHTMLAudioElementConstructor.h"
-#include "JSHTMLCollection.h"
-#include "JSHTMLOptionElementConstructor.h"
-#include "JSXMLHttpRequest.h"
-#include "Logging.h"
 #include "Page.h"
-#include "PausedTimeouts.h"
-#include "PlatformScreen.h"
-#include "PlugInInfoStore.h"
-#include "RenderView.h"
-#include "SecurityOrigin.h"
-#include "Settings.h"
-#include "WindowFeatures.h"
-#include "htmlediting.h"
-#include "kjs_css.h"
-#include "kjs_events.h"
-#include "kjs_navigator.h"
 #include "kjs_proxy.h"
-#include <wtf/MathExtras.h>
+#include "kjs_window.h"
 
-#if ENABLE(XSLT)
-#include "JSXSLTProcessor.h"
-#endif
+using namespace KJS;
 
-using namespace WebCore;
-using namespace EventNames;
+namespace WebCore {
 
-namespace KJS {
-
-static int lastUsedTimeoutId;
-
-static int timerNestingLevel = 0;
-const int cMaxTimerNestingLevel = 5;
-const double cMinimumTimerInterval = 0.010;
-
-struct WindowPrivate {
-    WindowPrivate()
-        : loc(0)
-        , m_evt(0)
-        , m_returnValueSlot(0)
-    {
-    }
-
-    Window::ListenersMap jsEventListeners;
-    Window::ListenersMap jsHTMLEventListeners;
-    Window::UnprotectedListenersMap jsUnprotectedEventListeners;
-    Window::UnprotectedListenersMap jsUnprotectedHTMLEventListeners;
-    mutable Location* loc;
-    WebCore::Event* m_evt;
-    JSValue** m_returnValueSlot;
-
-    typedef HashMap<int, DOMWindowTimer*> TimeoutsMap;
-    TimeoutsMap m_timeouts;
-};
-
-class DOMWindowTimer : public TimerBase {
-public:
-    DOMWindowTimer(int timeoutId, int nestingLevel, Window* object, ScheduledAction* action)
-        : m_timeoutId(timeoutId)
-        , m_nestingLevel(nestingLevel)
-        , m_object(object)
-        , m_action(action)
-    {
-    }
-
-    virtual ~DOMWindowTimer()
-    {
-        JSLock lock;
-        delete m_action;
-    }
-
-    int timeoutId() const { return m_timeoutId; }
-
-    int nestingLevel() const { return m_nestingLevel; }
-    void setNestingLevel(int n) { m_nestingLevel = n; }
-
-    ScheduledAction* action() const { return m_action; }
-    ScheduledAction* takeAction() { ScheduledAction* a = m_action; m_action = 0; return a; }
-
-private:
-    virtual void fired();
-
-    int m_timeoutId;
-    int m_nestingLevel;
-    Window* m_object;
-    ScheduledAction* m_action;
-};
-
-} // namespace KJS
-
-#include "kjs_window.lut.h"
-
-namespace KJS {
-
-////////////////////// Window Object ////////////////////////
-
-const ClassInfo Window::info = { "Window", 0, &WindowTable };
-
-/*
-@begin WindowTable 118
-# Warning, when adding a function to this object you need to add a case in Window::get
-# -- Functions --
-  atob                  &WindowProtoFuncAToB::create                DontDelete|Function 1
-  btoa                  &WindowProtoFuncBToA::create                DontDelete|Function 1
-  open                  &WindowProtoFuncOpen::create                DontDelete|Function 3
-  setTimeout            &WindowProtoFuncSetTimeout::create          DontDelete|Function 2
-  clearTimeout          &WindowProtoFuncClearTimeout::create        DontDelete|Function 1
-  setInterval           &WindowProtoFuncSetInterval::create         DontDelete|Function 2
-  clearInterval         &WindowProtoFuncClearTimeout::create        DontDelete|Function 1
-  addEventListener      &WindowProtoFuncAddEventListener::create    DontDelete|Function 3
-  removeEventListener   &WindowProtoFuncRemoveEventListener::create DontDelete|Function 3
-  showModalDialog       &WindowProtoFuncShowModalDialog::create     DontDelete|Function 1
-# Not implemented
-  captureEvents         &WindowProtoFuncNotImplemented::create      DontDelete|Function 0
-  releaseEvents         &WindowProtoFuncNotImplemented::create      DontDelete|Function 0
-
-# -- Attributes --
-  crypto                Window::Crypto              DontDelete|ReadOnly
-  event                 Window::Event_              DontDelete
-  location              Window::Location_           DontDelete
-  navigator             Window::Navigator_          DontDelete|ReadOnly
-  clientInformation     Window::ClientInformation   DontDelete|ReadOnly
-# -- Event Listeners --
-  onabort               Window::Onabort             DontDelete
-  onblur                Window::Onblur              DontDelete
-  onchange              Window::Onchange            DontDelete
-  onclick               Window::Onclick             DontDelete
-  ondblclick            Window::Ondblclick          DontDelete
-  onerror               Window::Onerror             DontDelete
-  onfocus               Window::Onfocus             DontDelete
-  onkeydown             Window::Onkeydown           DontDelete
-  onkeypress            Window::Onkeypress          DontDelete
-  onkeyup               Window::Onkeyup             DontDelete
-  onload                Window::Onload              DontDelete
-  onmousedown           Window::Onmousedown         DontDelete
-  onmousemove           Window::Onmousemove         DontDelete
-  onmouseout            Window::Onmouseout          DontDelete
-  onmouseover           Window::Onmouseover         DontDelete
-  onmouseup             Window::Onmouseup           DontDelete
-  onmousewheel          Window::OnWindowMouseWheel  DontDelete
-  onreset               Window::Onreset             DontDelete
-  onresize              Window::Onresize            DontDelete
-  onscroll              Window::Onscroll            DontDelete
-  onsearch              Window::Onsearch            DontDelete
-  onselect              Window::Onselect            DontDelete
-  onsubmit              Window::Onsubmit            DontDelete
-  onunload              Window::Onunload            DontDelete
-  onbeforeunload        Window::Onbeforeunload      DontDelete
-# -- Constructors --
-  Audio                 Window::Audio               DontDelete
-  DOMException          Window::DOMException        DontDelete
-  Image                 Window::Image               DontDelete
-  Option                Window::Option              DontDelete
-  XMLHttpRequest        Window::XMLHttpRequest      DontDelete
-  XSLTProcessor         Window::XSLTProcessor_      DontDelete
-@end
-*/
-
-Window::Window(DOMWindow* window)
-    : m_impl(window)
-    , d(new WindowPrivate)
+ScheduledAction::ScheduledAction(JSValue* func, const List& args)
+    : m_func(func)
 {
-    // Window destruction is not thread-safe because of
-    // the non-thread-safe WebCore structures it references.
-    Collector::collectOnMainThreadOnly(this);
-
-    // Time in milliseconds before the script timeout handler kicks in.
-    setTimeoutTime(10000);
+    List::const_iterator end = args.end();
+    for (List::const_iterator it = args.begin(); it != end; ++it)
+        m_args.append(*it);
 }
 
-Window::~Window()
-{
-    clearAllTimeouts();
-
-    // Clear any backpointers to the window
-
-    ListenersMap::iterator i2 = d->jsEventListeners.begin();
-    ListenersMap::iterator e2 = d->jsEventListeners.end();
-    for (; i2 != e2; ++i2)
-        i2->second->clearWindowObj();
-    i2 = d->jsHTMLEventListeners.begin();
-    e2 = d->jsHTMLEventListeners.end();
-    for (; i2 != e2; ++i2)
-        i2->second->clearWindowObj();
-
-    UnprotectedListenersMap::iterator i1 = d->jsUnprotectedEventListeners.begin();
-    UnprotectedListenersMap::iterator e1 = d->jsUnprotectedEventListeners.end();
-    for (; i1 != e1; ++i1)
-        i1->second->clearWindowObj();
-    i1 = d->jsUnprotectedHTMLEventListeners.begin();
-    e1 = d->jsUnprotectedHTMLEventListeners.end();
-    for (; i1 != e1; ++i1)
-        i1->second->clearWindowObj();
-}
-
-Window* Window::retrieveWindow(Frame* frame)
-{
-    JSObject* o = retrieve(frame)->getObject();
-
-    ASSERT(o || !frame->settings() || !frame->settings()->isJavaScriptEnabled());
-    return static_cast<Window*>(o);
-}
-
-Window* Window::retrieveActive(ExecState* exec)
-{
-    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
-    ASSERT(globalObject);
-    return static_cast<Window*>(globalObject);
-}
-
-JSValue* Window::retrieve(Frame* frame)
-{
-    ASSERT(frame);
-    if (KJSProxy* proxy = frame->scriptProxy())
-        return proxy->globalObject(); // the Global object is the "window"
-
-    return jsUndefined(); // This can happen with JS disabled on the domain of that window
-}
-
-Location* Window::location() const
-{
-    if (!d->loc)
-        d->loc = new Location(impl()->frame());
-    return d->loc;
-}
-
-// reference our special objects during garbage collection
-void Window::mark()
-{
-    JSGlobalObject::mark();
-    if (d->loc && !d->loc->marked())
-        d->loc->mark();
-}
-
-static bool allowPopUp(Frame* frame)
-{
-    if (!frame)
-        return false;
-    if (frame->scriptProxy()->processingUserGesture())
-        return true;
-    Settings* settings = frame->settings();
-    return settings && settings->JavaScriptCanOpenWindowsAutomatically();
-}
-
-static HashMap<String, String> parseModalDialogFeatures(const String& featuresArg)
-{
-    HashMap<String, String> map;
-
-    Vector<String> features = featuresArg.split(';');
-    Vector<String>::const_iterator end = features.end();
-    for (Vector<String>::const_iterator it = features.begin(); it != end; ++it) {
-        String s = *it;
-        int pos = s.find('=');
-        int colonPos = s.find(':');
-        if (pos >= 0 && colonPos >= 0)
-            continue; // ignore any strings that have both = and :
-        if (pos < 0)
-            pos = colonPos;
-        if (pos < 0) {
-            // null string for value means key without value
-            map.set(s.stripWhiteSpace().lower(), String());
-        } else {
-            String key = s.left(pos).stripWhiteSpace().lower();
-            String val = s.substring(pos + 1).stripWhiteSpace().lower();
-            int spacePos = val.find(' ');
-            if (spacePos != -1)
-                val = val.left(spacePos);
-            map.set(key, val);
-        }
-    }
-
-    return map;
-}
-
-static Frame* createWindow(ExecState* exec, Frame* openerFrame, const String& url,
-    const String& frameName, const WindowFeatures& windowFeatures, JSValue* dialogArgs)
-{
-    Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
-
-    ResourceRequest request;
-    if (activeFrame)
-        request.setHTTPReferrer(activeFrame->loader()->outgoingReferrer());
-    FrameLoadRequest frameRequest(request, frameName);
-
-    // FIXME: It's much better for client API if a new window starts with a URL, here where we
-    // know what URL we are going to open. Unfortunately, this code passes the empty string
-    // for the URL, but there's a reason for that. Before loading we have to set up the opener,
-    // openedByDOM, and dialogArguments values. Also, to decide whether to use the URL we currently
-    // do an allowsAccessFrom call using the window we create, which can't be done before creating it.
-    // We'd have to resolve all those issues to pass the URL instead of "".
-
-    bool created;
-    Frame* newFrame = openerFrame->loader()->createWindow(frameRequest, windowFeatures, created);
-    if (!newFrame)
-        return 0;
-
-    newFrame->loader()->setOpener(openerFrame);
-    newFrame->loader()->setOpenedByDOM();
-
-    Window* newWindow = Window::retrieveWindow(newFrame);
-
-    if (dialogArgs)
-        newWindow->putDirect("dialogArguments", dialogArgs);
-
-    if (!url.startsWith("javascript:", false) || newWindow->allowsAccessFrom(exec)) {
-        String completedURL = url.isEmpty() ? url : activeFrame->document()->completeURL(url);
-        bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
-
-        if (created) {
-            newFrame->loader()->changeLocation(KURL(completedURL.deprecatedString()), activeFrame->loader()->outgoingReferrer(), false, userGesture);
-            if (Document* oldDoc = openerFrame->document()) {
-                newFrame->document()->setDomainInternal(oldDoc->domain());
-                newFrame->document()->setBaseURL(oldDoc->baseURL());
-            }
-        } else if (!url.isEmpty())
-            newFrame->loader()->scheduleLocationChange(completedURL, activeFrame->loader()->outgoingReferrer(), false, userGesture);
-    }
-
-    return newFrame;
-}
-
-static bool canShowModalDialog(const Frame* frame)
-{
-    if (!frame)
-        return false;
-    return frame->page()->chrome()->canRunModal();
-}
-
-static bool canShowModalDialogNow(const Frame* frame)
-{
-    if (!frame)
-        return false;
-    return frame->page()->chrome()->canRunModalNow();
-}
-
-static JSValue* showModalDialog(ExecState* exec, Frame* frame, const String& url, JSValue* dialogArgs, const String& featureArgs)
-{
-    if (!canShowModalDialogNow(frame) || !allowPopUp(frame))
-        return jsUndefined();
-
-    const HashMap<String, String> features = parseModalDialogFeatures(featureArgs);
-
-    const bool trusted = false;
-
-    // The following features from Microsoft's documentation are not implemented:
-    // - default font settings
-    // - width, height, left, and top specified in units other than "px"
-    // - edge (sunken or raised, default is raised)
-    // - dialogHide: trusted && boolFeature(features, "dialoghide"), makes dialog hide when you print
-    // - help: boolFeature(features, "help", true), makes help icon appear in dialog (what does it do on Windows?)
-    // - unadorned: trusted && boolFeature(features, "unadorned");
-
-    if (!frame)
-        return jsUndefined();
-
-    FloatRect screenRect = screenAvailableRect(frame->view());
-
-    WindowFeatures wargs;
-    wargs.width = WindowFeatures::floatFeature(features, "dialogwidth", 100, screenRect.width(), 620); // default here came from frame size of dialog in MacIE
-    wargs.widthSet = true;
-    wargs.height = WindowFeatures::floatFeature(features, "dialogheight", 100, screenRect.height(), 450); // default here came from frame size of dialog in MacIE
-    wargs.heightSet = true;
-
-    wargs.x = WindowFeatures::floatFeature(features, "dialogleft", screenRect.x(), screenRect.right() - wargs.width, -1);
-    wargs.xSet = wargs.x > 0;
-    wargs.y = WindowFeatures::floatFeature(features, "dialogtop", screenRect.y(), screenRect.bottom() - wargs.height, -1);
-    wargs.ySet = wargs.y > 0;
-
-    if (WindowFeatures::boolFeature(features, "center", true)) {
-        if (!wargs.xSet) {
-            wargs.x = screenRect.x() + (screenRect.width() - wargs.width) / 2;
-            wargs.xSet = true;
-        }
-        if (!wargs.ySet) {
-            wargs.y = screenRect.y() + (screenRect.height() - wargs.height) / 2;
-            wargs.ySet = true;
-        }
-    }
-
-    wargs.dialog = true;
-    wargs.resizable = WindowFeatures::boolFeature(features, "resizable");
-    wargs.scrollbarsVisible = WindowFeatures::boolFeature(features, "scroll", true);
-    wargs.statusBarVisible = WindowFeatures::boolFeature(features, "status", !trusted);
-    wargs.menuBarVisible = false;
-    wargs.toolBarVisible = false;
-    wargs.locationBarVisible = false;
-    wargs.fullscreen = false;
-
-    Frame* dialogFrame = createWindow(exec, frame, url, "", wargs, dialogArgs);
-    if (!dialogFrame)
-        return jsUndefined();
-
-    Window* dialogWindow = Window::retrieveWindow(dialogFrame);
-
-    // Get the return value either just before clearing the dialog window's
-    // properties (in Window::clear), or when on return from runModal.
-    JSValue* returnValue = 0;
-    dialogWindow->setReturnValueSlot(&returnValue);
-    dialogFrame->page()->chrome()->runModal();
-    dialogWindow->setReturnValueSlot(0);
-
-    // If we don't have a return value, get it now.
-    // Either Window::clear was not called yet, or there was no return value,
-    // and in that case, there's no harm in trying again (no benefit either).
-    if (!returnValue)
-        returnValue = dialogWindow->getDirect("returnValue");
-
-    return returnValue ? returnValue : jsUndefined();
-}
-
-JSValue *Window::getValueProperty(ExecState *exec, int token) const
-{
-   ASSERT(impl()->frame());
-
-   switch (token) {
-   case Crypto:
-      return jsUndefined(); // FIXME: implement this
-   case DOMException:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      return getDOMExceptionConstructor(exec);
-    case Event_:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      if (!d->m_evt)
-        return jsUndefined();
-      return toJS(exec, d->m_evt);
-    case Location_:
-      return location();
-    case Navigator_:
-    case ClientInformation: {
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      // Store the navigator in the object so we get the same one each time.
-      Navigator *n = new Navigator(exec, impl()->frame());
-      // FIXME: this will make the "navigator" object accessible from windows that fail
-      // the security check the first time, but not subsequent times, seems weird.
-      const_cast<Window *>(this)->putDirect("navigator", n, DontDelete|ReadOnly);
-      const_cast<Window *>(this)->putDirect("clientInformation", n, DontDelete|ReadOnly);
-      return n;
-    }
-    case Image:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      // FIXME: this property (and the few below) probably shouldn't create a new object every
-      // time
-      return new ImageConstructorImp(exec, impl()->frame()->document());
-    case Option:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      return new JSHTMLOptionElementConstructor(exec, impl()->frame()->document());
-    case XMLHttpRequest:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      return new JSXMLHttpRequestConstructorImp(exec, impl()->frame()->document());
-    case Audio:
-#if ENABLE(VIDEO)
-      return new JSHTMLAudioElementConstructor(exec, impl()->frame()->document());
-#else
-      return jsUndefined();
-#endif
-#if ENABLE(XSLT)
-    case XSLTProcessor_:
-      if (!allowsAccessFrom(exec))
-        return jsUndefined();
-      return new XSLTProcessorConstructorImp(exec);
-#else
-    case XSLTProcessor_:
-      return jsUndefined();
-#endif
-   }
-
-   if (!allowsAccessFrom(exec))
-     return jsUndefined();
-
-   switch (token) {
-   case Onabort:
-     return getListener(exec, abortEvent);
-   case Onblur:
-     return getListener(exec, blurEvent);
-   case Onchange:
-     return getListener(exec, changeEvent);
-   case Onclick:
-     return getListener(exec, clickEvent);
-   case Ondblclick:
-     return getListener(exec, dblclickEvent);
-   case Onerror:
-     return getListener(exec, errorEvent);
-   case Onfocus:
-     return getListener(exec, focusEvent);
-   case Onkeydown:
-     return getListener(exec, keydownEvent);
-   case Onkeypress:
-     return getListener(exec, keypressEvent);
-   case Onkeyup:
-     return getListener(exec, keyupEvent);
-   case Onload:
-     return getListener(exec, loadEvent);
-   case Onmousedown:
-     return getListener(exec, mousedownEvent);
-   case Onmousemove:
-     return getListener(exec, mousemoveEvent);
-   case Onmouseout:
-     return getListener(exec, mouseoutEvent);
-   case Onmouseover:
-     return getListener(exec, mouseoverEvent);
-   case Onmouseup:
-     return getListener(exec, mouseupEvent);
-   case OnWindowMouseWheel:
-     return getListener(exec, mousewheelEvent);
-   case Onreset:
-     return getListener(exec, resetEvent);
-   case Onresize:
-     return getListener(exec,resizeEvent);
-   case Onscroll:
-     return getListener(exec,scrollEvent);
-   case Onsearch:
-     return getListener(exec,searchEvent);
-   case Onselect:
-     return getListener(exec,selectEvent);
-   case Onsubmit:
-     return getListener(exec,submitEvent);
-   case Onbeforeunload:
-     return getListener(exec, beforeunloadEvent);
-   case Onunload:
-     return getListener(exec, unloadEvent);
-   }
-   ASSERT_NOT_REACHED();
-   return jsUndefined();
-}
-
-JSValue* Window::childFrameGetter(ExecState*, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
-{
-    return retrieve(static_cast<Window*>(slot.slotBase())->impl()->frame()->tree()->child(AtomicString(propertyName)));
-}
-
-JSValue* Window::indexGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot)
-{
-    return retrieve(static_cast<Window*>(slot.slotBase())->impl()->frame()->tree()->child(slot.index()));
-}
-
-JSValue *Window::namedItemGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
-{
-  Window *thisObj = static_cast<Window *>(slot.slotBase());
-  Document *doc = thisObj->impl()->frame()->document();
-  ASSERT(thisObj->allowsAccessFrom(exec) && doc && doc->isHTMLDocument());
-
-  String name = propertyName;
-  RefPtr<WebCore::HTMLCollection> collection = doc->windowNamedItems(name);
-  if (collection->length() == 1)
-    return toJS(exec, collection->firstItem());
-  return toJS(exec, collection.get());
-}
-
-bool Window::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
-{
-  // Check for child frames by name before built-in properties to
-  // match Mozilla. This does not match IE, but some sites end up
-  // naming frames things that conflict with window properties that
-  // are in Moz but not IE. Since we have some of these, we have to do
-  // it the Moz way.
-  if (impl()->frame()->tree()->child(propertyName)) {
-    slot.setCustom(this, childFrameGetter);
-    return true;
-  }
-
-  const HashEntry* entry = Lookup::findEntry(&WindowTable, propertyName);
-  if (entry) {
-    if (entry->attr & Function) {
-      if (entry->value.functionValue == &WindowProtoFuncShowModalDialog::create) {
-        if (!canShowModalDialog(impl()->frame()))
-          return false;
-      }
-      if (allowsAccessFrom(exec))
-        slot.setStaticEntry(this, entry, staticFunctionGetter);
-      else
-        slot.setUndefined(this);
-    } else
-      slot.setStaticEntry(this, entry, staticValueGetter<Window>);
-    return true;
-  }
-
-  // FIXME: Search the whole frame hierachy somewhere around here.
-  // We need to test the correct priority order.
-
-  // allow window[1] or parent[1] etc. (#56983)
-  bool ok;
-  unsigned i = propertyName.toArrayIndex(&ok);
-  if (ok && i < impl()->frame()->tree()->childCount()) {
-    slot.setCustomIndex(this, i, indexGetter);
-    return true;
-  }
-
-  // allow shortcuts like 'Image1' instead of document.images.Image1
-  Document* doc = impl()->frame()->document();
-  if (doc && doc->isHTMLDocument()) {
-    if (!allowsAccessFrom(exec)) {
-      slot.setUndefined(this);
-      return true;
-    }
-
-    AtomicString atomicPropertyName = propertyName;
-    if (static_cast<HTMLDocument*>(doc)->hasNamedItem(atomicPropertyName) || doc->getElementById(atomicPropertyName)) {
-      slot.setCustom(this, namedItemGetter);
-      return true;
-    }
-  }
-
-  if (!allowsAccessFrom(exec)) {
-    slot.setUndefined(this);
-    return true;
-  }
-
-  return JSObject::getOwnPropertySlot(exec, propertyName, slot);
-}
-
-void Window::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
-{
-  const HashEntry* entry = Lookup::findEntry(&WindowTable, propertyName);
-  if (entry) {
-     if (entry->attr & Function) {
-       if (allowsAccessFrom(exec))
-         JSObject::put(exec, propertyName, value, attr);
-       return;
-    }
-    if (entry->attr & ReadOnly)
-      return;
-
-    switch (entry->value.intValue) {
-    case Location_: {
-      Frame* p = Window::retrieveActive(exec)->impl()->frame();
-      if (p) {
-        if (!p->loader()->shouldAllowNavigation(impl()->frame()))
-          return;
-        String dstUrl = p->loader()->completeURL(value->toString(exec)).string();
-        if (!dstUrl.startsWith("javascript:", false) || allowsAccessFrom(exec)) {
-          bool userGesture = p->scriptProxy()->processingUserGesture();
-          // We want a new history item if this JS was called via a user gesture
-          impl()->frame()->loader()->scheduleLocationChange(dstUrl, p->loader()->outgoingReferrer(), false, userGesture);
-        }
-      }
-      return;
-    }
-    case Onabort:
-      if (allowsAccessFrom(exec))
-        setListener(exec, abortEvent,value);
-      return;
-    case Onblur:
-      if (allowsAccessFrom(exec))
-        setListener(exec, blurEvent,value);
-      return;
-    case Onchange:
-      if (allowsAccessFrom(exec))
-        setListener(exec, changeEvent,value);
-      return;
-    case Onclick:
-      if (allowsAccessFrom(exec))
-        setListener(exec,clickEvent,value);
-      return;
-    case Ondblclick:
-      if (allowsAccessFrom(exec))
-        setListener(exec, dblclickEvent,value);
-      return;
-    case Onerror:
-      if (allowsAccessFrom(exec))
-        setListener(exec, errorEvent, value);
-      return;
-    case Onfocus:
-      if (allowsAccessFrom(exec))
-        setListener(exec,focusEvent,value);
-      return;
-    case Onkeydown:
-      if (allowsAccessFrom(exec))
-        setListener(exec,keydownEvent,value);
-      return;
-    case Onkeypress:
-      if (allowsAccessFrom(exec))
-        setListener(exec,keypressEvent,value);
-      return;
-    case Onkeyup:
-      if (allowsAccessFrom(exec))
-        setListener(exec,keyupEvent,value);
-      return;
-    case Onload:
-      if (allowsAccessFrom(exec))
-        setListener(exec,loadEvent,value);
-      return;
-    case Onmousedown:
-      if (allowsAccessFrom(exec))
-        setListener(exec,mousedownEvent,value);
-      return;
-    case Onmousemove:
-      if (allowsAccessFrom(exec))
-        setListener(exec,mousemoveEvent,value);
-      return;
-    case Onmouseout:
-      if (allowsAccessFrom(exec))
-        setListener(exec,mouseoutEvent,value);
-      return;
-    case Onmouseover:
-      if (allowsAccessFrom(exec))
-        setListener(exec,mouseoverEvent,value);
-      return;
-    case Onmouseup:
-      if (allowsAccessFrom(exec))
-        setListener(exec,mouseupEvent,value);
-      return;
-    case OnWindowMouseWheel:
-      if (allowsAccessFrom(exec))
-        setListener(exec, mousewheelEvent,value);
-      return;
-    case Onreset:
-      if (allowsAccessFrom(exec))
-        setListener(exec,resetEvent,value);
-      return;
-    case Onresize:
-      if (allowsAccessFrom(exec))
-        setListener(exec,resizeEvent,value);
-      return;
-    case Onscroll:
-      if (allowsAccessFrom(exec))
-        setListener(exec,scrollEvent,value);
-      return;
-    case Onsearch:
-        if (allowsAccessFrom(exec))
-            setListener(exec,searchEvent,value);
-        return;
-    case Onselect:
-      if (allowsAccessFrom(exec))
-        setListener(exec,selectEvent,value);
-      return;
-    case Onsubmit:
-      if (allowsAccessFrom(exec))
-        setListener(exec,submitEvent,value);
-      return;
-    case Onbeforeunload:
-      if (allowsAccessFrom(exec))
-        setListener(exec, beforeunloadEvent, value);
-      return;
-    case Onunload:
-      if (allowsAccessFrom(exec))
-        setListener(exec, unloadEvent, value);
-      return;
-    default:
-      break;
-    }
-  }
-  if (allowsAccessFrom(exec))
-    JSObject::put(exec, propertyName, value, attr);
-}
-
-bool Window::allowsAccessFrom(const JSGlobalObject* other) const
-{
-    const Frame* originFrame = static_cast<const Window*>(other)->impl()->frame();
-    if (!originFrame)
-        return false;
-
-    const Frame* targetFrame = impl()->frame();
-    if (!targetFrame)
-        return false;
-
-    if (originFrame == targetFrame)
-        return true;
-
-    WebCore::Document* targetDocument = targetFrame->document();
-
-    // JS may be attempting to access the "window" object, which should be valid,
-    // even if the document hasn't been constructed yet.  If the document doesn't
-    // exist yet allow JS to access the window object.
-    if (!targetDocument)
-        return true;
-
-    WebCore::Document* originDocument = originFrame->document();
-
-    const SecurityOrigin& originSecurityOrigin = originDocument->securityOrigin();
-    const SecurityOrigin& targetSecurityOrigin = targetDocument->securityOrigin();
-
-    if (originSecurityOrigin.canAccess(targetSecurityOrigin))
-        return true;
-
-    if (!targetFrame->settings()->privateBrowsingEnabled()) {
-        // FIXME: this error message should contain more specifics of why the same origin check has failed.
-        String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains, protocols and ports must match.\n",
-                                        targetDocument->url().utf8().data(), originDocument->url().utf8().data());
-
-        if (Interpreter::shouldPrintExceptions())
-            printf("%s", message.utf8().data());
-
-        if (Page* page = targetFrame->page())
-            page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, 1, String()); // FIXME: provide a real line number and source URL.
-    }
-
-    return false;
-}
-
-ExecState* Window::globalExec()
-{
-    // We need to make sure that any script execution happening in this
-    // frame does not destroy it
-    ASSERT(impl()->frame());
-    impl()->frame()->keepAlive();
-    return JSGlobalObject::globalExec();
-}
-
-bool Window::shouldInterruptScript() const
-{
-    ASSERT(impl()->frame());
-    Page* page = impl()->frame()->page();
-
-    // See <rdar://problem/5479443>. We don't think that page can ever be NULL
-    // in this case, but if it is, we've gotten into a state where we may have
-    // hung the UI, with no way to ask the client whether to cancel execution.
-    // For now, our solution is just to cancel execution no matter what,
-    // ensuring that we never hang. We might want to consider other solutions
-    // if we discover problems with this one.
-    ASSERT(page);
-    if (!page)
-        return true;
-
-    return page->chrome()->shouldInterruptJavaScript();
-}
-
-void Window::setListener(ExecState* exec, const AtomicString& eventType, JSValue* func)
-{
-    ASSERT(impl()->frame());
-    Document* doc = impl()->frame()->document();
-    if (!doc)
-        return;
-
-    doc->setHTMLWindowEventListener(eventType, findOrCreateJSEventListener(func, true));
-}
-
-JSValue* Window::getListener(ExecState* exec, const AtomicString& eventType) const
-{
-    ASSERT(impl()->frame());
-    Document* doc = impl()->frame()->document();
-    if (!doc)
-        return jsUndefined();
-
-    WebCore::EventListener* listener = doc->getHTMLWindowEventListener(eventType);
-    if (listener && static_cast<JSEventListener*>(listener)->listenerObj())
-        return static_cast<JSEventListener*>(listener)->listenerObj();
-    return jsNull();
-}
-
-JSEventListener* Window::findJSEventListener(JSValue* val, bool html)
-{
-    if (!val->isObject())
-        return 0;
-    JSObject* object = static_cast<JSObject*>(val);
-    ListenersMap& listeners = html ? d->jsHTMLEventListeners : d->jsEventListeners;
-    return listeners.get(object);
-}
-
-JSEventListener* Window::findOrCreateJSEventListener(JSValue* val, bool html)
-{
-    JSEventListener* listener = findJSEventListener(val, html);
-    if (listener)
-        return listener;
-
-    if (!val->isObject())
-        return 0;
-    JSObject* object = static_cast<JSObject*>(val);
-
-    // Note that the JSEventListener constructor adds it to our jsEventListeners list
-    return new JSEventListener(object, this, html);
-}
-
-JSUnprotectedEventListener* Window::findJSUnprotectedEventListener(JSValue* val, bool html)
-{
-    if (!val->isObject())
-        return 0;
-    JSObject* object = static_cast<JSObject*>(val);
-    UnprotectedListenersMap& listeners = html ? d->jsUnprotectedHTMLEventListeners : d->jsUnprotectedEventListeners;
-    return listeners.get(object);
-}
-
-JSUnprotectedEventListener* Window::findOrCreateJSUnprotectedEventListener(JSValue* val, bool html)
-{
-    JSUnprotectedEventListener* listener = findJSUnprotectedEventListener(val, html);
-    if (listener)
-        return listener;
-    if (!val->isObject())
-        return 0;
-    JSObject* object = static_cast<JSObject*>(val);
-
-    // The JSUnprotectedEventListener constructor adds it to our jsUnprotectedEventListeners map.
-    return new JSUnprotectedEventListener(object, this, html);
-}
-
-void Window::clearHelperObjectProperties()
-{
-    d->loc = 0;
-    d->m_evt = 0;
-}
-
-void Window::clear()
-{
-  JSLock lock;
-
-  if (d->m_returnValueSlot && !*d->m_returnValueSlot)
-    *d->m_returnValueSlot = getDirect("returnValue");
-
-  clearAllTimeouts();
-  clearProperties();
-  clearHelperObjectProperties();
-
-  // Now recreate a working global object for the next URL that will use us; but only if we haven't been
-  // disconnected yet
-  if (Frame* frame = impl()->frame())
-    frame->scriptProxy()->globalObject()->reset(JSDOMWindowPrototype::self());
-
-  // there's likely to be lots of garbage now
-  gcController().garbageCollectSoon();
-}
-
-void Window::setCurrentEvent(Event* evt)
-{
-    d->m_evt = evt;
-}
-
-Event* Window::currentEvent()
-{
-    return d->m_evt;
-}
-
-JSValue* WindowProtoFuncAToB::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-
-    if (args.size() < 1)
-        return throwError(exec, SyntaxError, "Not enough arguments");
-
-    JSValue* v = args[0];
-    if (v->isNull())
-        return jsString();
-
-    UString s = v->toString(exec);
-    if (!s.is8Bit()) {
-        setDOMException(exec, INVALID_CHARACTER_ERR);
-        return jsUndefined();
-    }
-
-    Vector<char> in(s.size());
-    for (int i = 0; i < s.size(); ++i)
-        in[i] = static_cast<char>(s.data()[i].unicode());
-    Vector<char> out;
-
-    if (!base64Decode(in, out))
-        return throwError(exec, GeneralError, "Cannot decode base64");
-
-    return jsString(String(out.data(), out.size()));
-}
-
-JSValue* WindowProtoFuncBToA::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-
-    if (args.size() < 1)
-        return throwError(exec, SyntaxError, "Not enough arguments");
-
-    JSValue* v = args[0];
-    if (v->isNull())
-        return jsString();
-
-    UString s = v->toString(exec);
-    if (!s.is8Bit()) {
-        setDOMException(exec, INVALID_CHARACTER_ERR);
-        return jsUndefined();
-    }
-
-    Vector<char> in(s.size());
-    for (int i = 0; i < s.size(); ++i)
-        in[i] = static_cast<char>(s.data()[i].unicode());
-    Vector<char> out;
-
-    base64Encode(in, out);
-
-    return jsString(String(out.data(), out.size()));
-}
-
-JSValue* WindowProtoFuncOpen::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-    Frame* frame = window->impl()->frame();
-    if (!frame)
-        return jsUndefined();
-    Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
-    if (!activeFrame)
-        return  jsUndefined();
-
-    Page* page = frame->page();
-
-    String urlString = valueToStringWithUndefinedOrNullCheck(exec, args[0]);
-    AtomicString frameName = args[1]->isUndefinedOrNull() ? "_blank" : AtomicString(args[1]->toString(exec));
-
-    // Because FrameTree::find() returns true for empty strings, we must check for empty framenames.
-    // Otherwise, illegitimate window.open() calls with no name will pass right through the popup blocker.
-    if (!allowPopUp(frame) && (frameName.isEmpty() || !frame->tree()->find(frameName)))
-        return jsUndefined();
-
-    // Get the target frame for the special cases of _top and _parent.  In those
-    // cases, we can schedule a location change right now and return early.
-    bool topOrParent = false;
-    if (frameName == "_top") {
-        frame = frame->tree()->top();
-        topOrParent = true;
-    } else if (frameName == "_parent") {
-        if (Frame* parent = frame->tree()->parent())
-            frame = parent;
-        if (!activeFrame->loader()->shouldAllowNavigation(frame))
-            return jsUndefined();
-        topOrParent = true;
-    }
-    if (topOrParent) {
-        String completedURL;
-        if (!urlString.isEmpty())
-            completedURL = activeFrame->document()->completeURL(urlString);
-
-        const Window* targetedWindow = Window::retrieveWindow(frame);
-        if (!completedURL.isEmpty() && (!completedURL.startsWith("javascript:", false) || (targetedWindow && targetedWindow->allowsAccessFrom(exec)))) {
-            bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
-            frame->loader()->scheduleLocationChange(completedURL, activeFrame->loader()->outgoingReferrer(), false, userGesture);
-        }
-        return Window::retrieve(frame);
-    }
-
-    // In the case of a named frame or a new window, we'll use the createWindow() helper
-    WindowFeatures windowFeatures(valueToStringWithUndefinedOrNullCheck(exec, args[2]));
-    FloatRect windowRect(windowFeatures.x, windowFeatures.y, windowFeatures.width, windowFeatures.height);
-    WebCore::DOMWindow::adjustWindowRect(screenAvailableRect(page->mainFrame()->view()), windowRect, windowRect);
-
-    windowFeatures.x = windowRect.x();
-    windowFeatures.y = windowRect.y();
-    windowFeatures.height = windowRect.height();
-    windowFeatures.width = windowRect.width();
-
-    frame = createWindow(exec, frame, urlString, frameName, windowFeatures, 0);
-
-    if (!frame)
-        return jsUndefined();
-
-    return Window::retrieve(frame); // global object
-}
-
-JSValue* WindowProtoFuncSetTimeout::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-
-    JSValue* v = args[0];
-    if (v->isString())
-        return jsNumber(window->installTimeout(v->toString(exec), args[1]->toInt32(exec), true /*single shot*/));
-    if (v->isObject() && static_cast<JSObject*>(v)->implementsCall()) {
-        List argsTail;
-        args.getSlice(2, argsTail);
-        return jsNumber(window->installTimeout(v, argsTail, args[1]->toInt32(exec), true /*single shot*/));
-    }
-
-    return jsUndefined();
-}
-
-JSValue* WindowProtoFuncClearTimeout::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    // Also the implementation for window.clearInterval()
-
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-
-    window->clearTimeout(args[0]->toInt32(exec));
-    return jsUndefined();
-}
-
-JSValue* WindowProtoFuncSetInterval::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-
-    if (args.size() >= 2) {
-        JSValue* v = args[0];
-        int delay = args[1]->toInt32(exec);
-        if (v->isString())
-            return jsNumber(window->installTimeout(v->toString(exec), delay, false));
-        if (v->isObject() && static_cast<JSObject*>(v)->implementsCall()) {
-            List argsTail;
-            args.getSlice(2, argsTail);
-            return jsNumber(window->installTimeout(v, argsTail, delay, false));
-        }
-    }
-
-    return jsUndefined();
-
-}
-
-JSValue* WindowProtoFuncAddEventListener::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-    Frame* frame = window->impl()->frame();
-    if (!frame)
-        return jsUndefined();
-
-    if (JSEventListener* listener = window->findOrCreateJSEventListener(args[1])) {
-        if (Document* doc = frame->document())
-            doc->addWindowEventListener(AtomicString(args[0]->toString(exec)), listener, args[2]->toBoolean(exec));
-    }
-
-    return jsUndefined();
-}
-
-JSValue* WindowProtoFuncRemoveEventListener::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-    Frame* frame = window->impl()->frame();
-    if (!frame)
-        return jsUndefined();
-
-    if (JSEventListener* listener = window->findJSEventListener(args[1])) {
-        if (Document* doc = frame->document())
-            doc->removeWindowEventListener(AtomicString(args[0]->toString(exec)), listener, args[2]->toBoolean(exec));
-    }
-
-    return jsUndefined();
-}
-
-JSValue* WindowProtoFuncShowModalDialog::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-    Window* window = static_cast<Window*>(thisObj);
-    Frame* frame = window->impl()->frame();
-    if (!frame)
-        return jsUndefined();
-
-    return showModalDialog(exec, frame, valueToStringWithUndefinedOrNullCheck(exec, args[0]), args[1], valueToStringWithUndefinedOrNullCheck(exec, args[2]));
-}
-
-JSValue* WindowProtoFuncNotImplemented::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Window::info))
-        return throwError(exec, TypeError);
-
-    return jsUndefined();
-}
-
-void Window::setReturnValueSlot(JSValue** slot)
-{
-    d->m_returnValueSlot = slot;
-}
-
-////////////////////// ScheduledAction ////////////////////////
 
 void ScheduledAction::execute(Window* window)
@@ -1227 +69 @@
             List args;
             size_t size = m_args.size();
-            for (size_t i = 0; i < size; ++i) {
+            for (size_t i = 0; i < size; ++i)
                 args.append(m_args[i]);
-            }
 
             globalObject->startTimeoutCheck();
@@ -1259 +100 @@
 }
 
-////////////////////// timeouts ////////////////////////
-
-void Window::clearAllTimeouts()
-{
-    deleteAllValues(d->m_timeouts);
-    d->m_timeouts.clear();
-}
-
-int Window::installTimeout(ScheduledAction* a, int t, bool singleShot)
-{
-    int timeoutId = ++lastUsedTimeoutId;
-
-    // avoid wraparound going negative on us
-    if (timeoutId <= 0)
-        timeoutId = 1;
-
-    int nestLevel = timerNestingLevel + 1;
-    DOMWindowTimer* timer = new DOMWindowTimer(timeoutId, nestLevel, this, a);
-    ASSERT(!d->m_timeouts.get(timeoutId));
-    d->m_timeouts.set(timeoutId, timer);
-    // Use a minimum interval of 10 ms to match other browsers, but only once we've
-    // nested enough to notice that we're repeating.
-    // Faster timers might be "better", but they're incompatible.
-    double interval = max(0.001, t * 0.001);
-    if (interval < cMinimumTimerInterval && nestLevel >= cMaxTimerNestingLevel)
-        interval = cMinimumTimerInterval;
-    if (singleShot)
-        timer->startOneShot(interval);
-    else
-        timer->startRepeating(interval);
-    return timeoutId;
-}
-
-ScheduledAction::ScheduledAction(JSValue* func, const List& args)
-    : m_func(func)
-{
-    List::const_iterator end = args.end();
-    for (List::const_iterator it = args.begin(); it != end; ++it)
-        m_args.append(*it);
-}
-
-int Window::installTimeout(const UString& handler, int t, bool singleShot)
-{
-    return installTimeout(new ScheduledAction(handler), t, singleShot);
-}
-
-int Window::installTimeout(JSValue* func, const List& args, int t, bool singleShot)
-{
-    return installTimeout(new ScheduledAction(func, args), t, singleShot);
-}
-
-WebCore::PausedTimeouts* Window::pauseTimeouts()
-{
-    size_t count = d->m_timeouts.size();
-    if (count == 0)
-        return 0;
-
-    PausedTimeout* t = new PausedTimeout [count];
-    PausedTimeouts* result = new PausedTimeouts(t, count);
-
-    WindowPrivate::TimeoutsMap::iterator it = d->m_timeouts.begin();
-    for (size_t i = 0; i != count; ++i, ++it) {
-        int timeoutId = it->first;
-        DOMWindowTimer* timer = it->second;
-        t[i].timeoutId = timeoutId;
-        t[i].nestingLevel = timer->nestingLevel();
-        t[i].nextFireInterval = timer->nextFireInterval();
-        t[i].repeatInterval = timer->repeatInterval();
-        t[i].action = timer->takeAction();
-    }
-    ASSERT(it == d->m_timeouts.end());
-
-    deleteAllValues(d->m_timeouts);
-    d->m_timeouts.clear();
-
-    return result;
-}
-
-void Window::resumeTimeouts(PausedTimeouts* timeouts)
-{
-    if (!timeouts)
-        return;
-    size_t count = timeouts->numTimeouts();
-    PausedTimeout* array = timeouts->takeTimeouts();
-    for (size_t i = 0; i != count; ++i) {
-        int timeoutId = array[i].timeoutId;
-        DOMWindowTimer* timer = new DOMWindowTimer(timeoutId, array[i].nestingLevel, this, array[i].action);
-        d->m_timeouts.set(timeoutId, timer);
-        timer->start(array[i].nextFireInterval, array[i].repeatInterval);
-    }
-    delete [] array;
-}
-
-void Window::clearTimeout(int timeoutId, bool delAction)
-{
-    // timeout IDs have to be positive, and 0 and -1 are unsafe to
-    // even look up since they are the empty and deleted value
-    // respectively
-    if (timeoutId <= 0)
-        return;
-
-    delete d->m_timeouts.take(timeoutId);
-}
-
-void Window::timerFired(DOMWindowTimer* timer)
-{
-    // Simple case for non-one-shot timers.
-    if (timer->isActive()) {
-        int timeoutId = timer->timeoutId();
-
-        timer->action()->execute(this);
-        if (d->m_timeouts.contains(timeoutId) && timer->repeatInterval() && timer->repeatInterval() < cMinimumTimerInterval) {
-            timer->setNestingLevel(timer->nestingLevel() + 1);
-            if (timer->nestingLevel() >= cMaxTimerNestingLevel)
-                timer->augmentRepeatInterval(cMinimumTimerInterval - timer->repeatInterval());
-        }
-        return;
-    }
-
-    // Delete timer before executing the action for one-shot timers.
-    ScheduledAction* action = timer->takeAction();
-    d->m_timeouts.remove(timer->timeoutId());
-    delete timer;
-    action->execute(this);
-
-    JSLock lock;
-    delete action;
-}
-
-void Window::disconnectFrame()
-{
-    clearAllTimeouts();
-    if (d->loc)
-        d->loc->m_frame = 0;
-}
-
-Window::ListenersMap& Window::jsEventListeners()
-{
-    return d->jsEventListeners;
-}
-
-Window::ListenersMap& Window::jsHTMLEventListeners()
-{
-    return d->jsHTMLEventListeners;
-}
-
-Window::UnprotectedListenersMap& Window::jsUnprotectedEventListeners()
-{
-    return d->jsUnprotectedEventListeners;
-}
-
-Window::UnprotectedListenersMap& Window::jsUnprotectedHTMLEventListeners()
-{
-    return d->jsUnprotectedHTMLEventListeners;
-}
-
-////////////////////// Location Object ////////////////////////
-
-const ClassInfo Location::info = { "Location", 0, &LocationTable };
-/*
-@begin LocationTable 12
-  assign        &LocationProtoFuncAssign::create        DontDelete|Function 1
-  hash          Location::Hash                          DontDelete
-  host          Location::Host                          DontDelete
-  hostname      Location::Hostname                      DontDelete
-  href          Location::Href                          DontDelete
-  pathname      Location::Pathname                      DontDelete
-  port          Location::Port                          DontDelete
-  protocol      Location::Protocol                      DontDelete
-  search        Location::Search                        DontDelete
-  toString      &LocationProtoFuncToString::create      DontEnum|DontDelete|Function 0
-  replace       &LocationProtoFuncReplace::create       DontDelete|Function 1
-  reload        &LocationProtoFuncReload::create        DontDelete|Function 0
-@end
-*/
-
-Location::Location(Frame* frame)
-    : m_frame(frame)
-{
-}
-
-JSValue *Location::getValueProperty(ExecState* exec, int token) const
-{
-  KURL url = m_frame->loader()->url();
-  switch (token) {
-  case Hash:
-    return jsString(url.ref().isNull() ? "" : "#" + url.ref());
-  case Host: {
-    // Note: this is the IE spec. The NS spec swaps the two, it says
-    // "The hostname property is the concatenation of the host and port properties, separated by a colon."
-    // Bleh.
-    UString str = url.host();
-    if (url.port())
-        str += ":" + String::number((int)url.port());
-    return jsString(str);
-  }
-  case Hostname:
-    return jsString(url.host());
-  case Href:
-    if (!url.hasPath())
-      return jsString(url.prettyURL() + "/");
-    return jsString(url.prettyURL());
-  case Pathname:
-    return jsString(url.path().isEmpty() ? "/" : url.path());
-  case Port:
-    return jsString(url.port() ? String::number((int)url.port()) : "");
-  case Protocol:
-    return jsString(url.protocol() + ":");
-  case Search:
-    return jsString(url.query());
-  default:
-    ASSERT_NOT_REACHED();
-    return jsUndefined();
-  }
-}
-
-bool Location::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-  if (!m_frame)
-    return false;
-
-  const Window* window = Window::retrieveWindow(m_frame);
-
-  const HashEntry* entry = Lookup::findEntry(&LocationTable, propertyName);
-  if (!entry || !(entry->attr & KJS::Function) || (entry->value.functionValue != &LocationProtoFuncReplace::create
-                                                   && entry->value.functionValue != &LocationProtoFuncReload::create
-                                                   && entry->value.functionValue != &LocationProtoFuncAssign::create))  {
-    if (!window || !window->allowsAccessFrom(exec)) {
-      slot.setUndefined(this);
-      return true;
-    }
-  }
-
-  return getStaticPropertySlot<Location, JSObject>(exec, &LocationTable, this, propertyName, slot);
-}
-
-void Location::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
-{
-  if (!m_frame)
-    return;
-
-  DeprecatedString str = value->toString(exec);
-  KURL url = m_frame->loader()->url();
-  const Window* window = Window::retrieveWindow(m_frame);
-  bool sameDomainAccess = window && window->allowsAccessFrom(exec);
-
-  const HashEntry* entry = Lookup::findEntry(&LocationTable, propertyName);
-
-  if (entry) {
-      // cross-domain access to the location is allowed when assigning the whole location,
-      // but not when assigning the individual pieces, since that might inadvertently
-      // disclose other parts of the original location.
-      if (entry->value.intValue != Href && !sameDomainAccess)
-          return;
-
-      switch (entry->value.intValue) {
-      case Href: {
-          Frame* frame = Window::retrieveActive(exec)->impl()->frame();
-          if (!frame)
-              return;
-          if (!frame->loader()->shouldAllowNavigation(m_frame))
-              return;
-          url = frame->loader()->completeURL(str);
-          break;
-      }
-      case Hash: {
-          if (str.startsWith("#"))
-              str = str.mid(1);
-          if (url.ref() == str)
-              return;
-          url.setRef(str);
-          break;
-      }
-      case Host: {
-          url.setHostAndPort(str);
-          break;
-      }
-      case Hostname:
-          url.setHost(str);
-          break;
-      case Pathname:
-          url.setPath(str);
-          break;
-      case Port:
-          url.setPort(str.toUInt());
-          break;
-      case Protocol:
-          url.setProtocol(str);
-          break;
-      case Search:
-          url.setQuery(str);
-          break;
-      default:
-          // Disallow changing other properties in LocationTable. e.g., "window.location.toString = ...".
-          // <http://bugs.webkit.org/show_bug.cgi?id=12720>
-          return;
-      }
-  } else {
-      if (sameDomainAccess)
-          JSObject::put(exec, propertyName, value, attr);
-      return;
-  }
-
-  Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
-  if (!url.deprecatedString().startsWith("javascript:", false) || sameDomainAccess) {
-    bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
-    m_frame->loader()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), false, userGesture);
-  }
-}
-
-JSValue* LocationProtoFuncReplace::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Location::info))
-        return throwError(exec, TypeError);
-    Location* location = static_cast<Location*>(thisObj);
-    Frame* frame = location->frame();
-    if (!frame)
-        return jsUndefined();
-
-    Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
-    if (activeFrame) {
-        if (!activeFrame->loader()->shouldAllowNavigation(frame))
-            return jsUndefined();
-        DeprecatedString str = args[0]->toString(exec);
-        const Window* window = Window::retrieveWindow(frame);
-        if (!str.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
-            bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
-            frame->loader()->scheduleLocationChange(activeFrame->loader()->completeURL(str).string(), activeFrame->loader()->outgoingReferrer(), true, userGesture);
-        }
-    }
-
-    return jsUndefined();
-}
-
-JSValue* LocationProtoFuncReload::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Location::info))
-        return throwError(exec, TypeError);
-    Location* location = static_cast<Location*>(thisObj);
-    Frame* frame = location->frame();
-    if (!frame)
-        return jsUndefined();
-
-    Window* window = Window::retrieveWindow(frame);
-    if (!window->allowsAccessFrom(exec))
-        return jsUndefined();
-
-    if (!frame->loader()->url().deprecatedString().startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
-        bool userGesture = Window::retrieveActive(exec)->impl()->frame()->scriptProxy()->processingUserGesture();
-        frame->loader()->scheduleRefresh(userGesture);
-    }
-    return jsUndefined();
-}
-
-JSValue* LocationProtoFuncAssign::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Location::info))
-        return throwError(exec, TypeError);
-    Location* location = static_cast<Location*>(thisObj);
-    Frame* frame = location->frame();
-    if (!frame)
-        return jsUndefined();
-
-    Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
-    if (activeFrame) {
-        if (!activeFrame->loader()->shouldAllowNavigation(frame))
-            return jsUndefined();
-        const Window* window = Window::retrieveWindow(frame);
-        String dstUrl = activeFrame->loader()->completeURL(args[0]->toString(exec)).string();
-        if (!dstUrl.startsWith("javascript:", false) || (window && window->allowsAccessFrom(exec))) {
-            bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
-            // We want a new history item if this JS was called via a user gesture
-            frame->loader()->scheduleLocationChange(dstUrl, activeFrame->loader()->outgoingReferrer(), false, userGesture);
-        }
-    }
-
-    return jsUndefined();
-}
-
-JSValue* LocationProtoFuncToString::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    if (!thisObj->inherits(&Location::info))
-        return throwError(exec, TypeError);
-    Location* location = static_cast<Location*>(thisObj);
-    Frame* frame = location->frame();
-    if (!frame)
-        return jsUndefined();
-
-    const KURL& url = frame->loader()->url();
-    if (!url.hasPath())
-        return jsString(url.prettyURL() + "/");
-    return jsString(url.prettyURL());
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void DOMWindowTimer::fired()
-{
-    timerNestingLevel = m_nestingLevel;
-    m_object->timerFired(this);
-    timerNestingLevel = 0;
-}
-
-} // namespace KJS
-
-using namespace KJS;
-
-namespace WebCore {
-
-JSValue* toJS(ExecState*, DOMWindow* domWindow)
-{
-    if (!domWindow)
-        return jsNull();
-    Frame* frame = domWindow->frame();
-    if (!frame)
-        return jsNull();
-    return Window::retrieve(frame);
-}
-
 } // namespace WebCore

trunk/WebCore/bindings/js/ScheduledAction.h

@@ -18 +18 @@
  */
 
-#ifndef kjs_window_h
-#define kjs_window_h
+#ifndef ScheduledAction_h
+#define ScheduledAction_h
 
 #include "PlatformString.h"
-#include "kjs_binding.h"
 #include <kjs/protect.h>
-#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
+#include <wtf/Vector.h>
+
+namespace KJS {
+    class Window;
+    class JSValue;
+    class List;
+}
 
 namespace WebCore {
-    class AtomicString;
-    class DOMWindow;
-    class Frame;
-    class JSEventListener;
-    class JSUnprotectedEventListener;
-    class PausedTimeouts;
-}
-
-namespace KJS {
-
-    class DOMWindowTimer;
-    class Location;
-    class ScheduledAction;
-    class Window;
-    class WindowFunc;
-    class WindowPrivate;
-
-  // This is the only WebCore JS binding which does not inherit from DOMObject
-  class Window : public JSGlobalObject {
-    friend class Location;
-    friend class ScheduledAction;
-  protected:
-    Window(WebCore::DOMWindow*);
-
-  public:
-    virtual ~Window();
-
-    WebCore::DOMWindow* impl() const { return m_impl.get(); }
-
-    void disconnectFrame();
-
-    // Returns and registers a window object. In case there's already a Window
-    // for the specified frame p this will be returned in order to have unique
-    // bindings.
-    static JSValue* retrieve(WebCore::Frame*);
-
-    // Returns the Window object for a given HTML frame
-    static Window* retrieveWindow(WebCore::Frame*);
-
-    // Returns a pointer to the Window object this javascript interpreting instance 
-    // was called from.
-    static Window* retrieveActive(ExecState*);
-
-    virtual void mark();
-
-    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    JSValue* getValueProperty(ExecState*, int token) const;
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue*, int attr = None);
-
-    int installTimeout(const UString& handler, int t, bool singleShot);
-    int installTimeout(JSValue* function, const List& args, int t, bool singleShot);
-    void clearTimeout(int timerId, bool delAction = true);
-    WebCore::PausedTimeouts* pauseTimeouts();
-    void resumeTimeouts(WebCore::PausedTimeouts*);
-
-    void timerFired(DOMWindowTimer*);
-
-    Location* location() const;
-
-    // Finds a wrapper of a JS EventListener, returns 0 if no existing one.
-    WebCore::JSEventListener* findJSEventListener(JSValue*, bool html = false);
-
-    // Finds or creates a wrapper of a JS EventListener. JS EventListener object is GC-protected.
-    WebCore::JSEventListener *findOrCreateJSEventListener(JSValue*, bool html = false);
-
-    // Finds a wrapper of a GC-unprotected JS EventListener, returns 0 if no existing one.
-    WebCore::JSUnprotectedEventListener* findJSUnprotectedEventListener(JSValue*, bool html = false);
-
-    // Finds or creates a wrapper of a JS EventListener. JS EventListener object is *NOT* GC-protected.
-    WebCore::JSUnprotectedEventListener *findOrCreateJSUnprotectedEventListener(JSValue*, bool html = false);
-
-    void clear();
-
-    void setCurrentEvent(WebCore::Event*);
-    WebCore::Event* currentEvent();
-
-    // Set a place to put a dialog return value when the window is cleared.
-    void setReturnValueSlot(JSValue** slot);
-
-    typedef HashMap<JSObject*, WebCore::JSEventListener*> ListenersMap;
-    typedef HashMap<JSObject*, WebCore::JSUnprotectedEventListener*> UnprotectedListenersMap;
-    
-    ListenersMap& jsEventListeners();
-    ListenersMap& jsHTMLEventListeners();
-    UnprotectedListenersMap& jsUnprotectedEventListeners();
-    UnprotectedListenersMap& jsUnprotectedHTMLEventListeners();
-    
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-
-    virtual ExecState* globalExec();
-
-    virtual bool shouldInterruptScript() const;
-
-    virtual bool allowsAccessFrom(const JSGlobalObject*) const;
-    bool allowsAccessFrom(ExecState* exec) const { return allowsAccessFrom(exec->dynamicGlobalObject()); }
-
-    enum {
-        // Attributes
-        Crypto, Event_, Location_, Navigator_,
-        ClientInformation,
-
-        // Event Listeners
-        Onabort, Onblur, Onchange, Onclick,
-        Ondblclick, Onerror, Onfocus, Onkeydown,
-        Onkeypress, Onkeyup, Onload, Onmousedown,
-        Onmousemove, Onmouseout, Onmouseover, Onmouseup,
-        OnWindowMouseWheel, Onreset, Onresize, Onscroll,
-        Onsearch, Onselect, Onsubmit, Onunload,
-        Onbeforeunload,
-
-        // Constructors
-        DOMException, Audio, Image, Option, XMLHttpRequest,
-        XSLTProcessor_
-    };
-
-  private:
-    JSValue* getListener(ExecState*, const WebCore::AtomicString& eventType) const;
-    void setListener(ExecState*, const WebCore::AtomicString& eventType, JSValue* func);
-
-    static JSValue* childFrameGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot&);
-    static JSValue* namedFrameGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot&);
-    static JSValue* indexGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot&);
-    static JSValue* namedItemGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot&);
-
-    void clearHelperObjectProperties();
-    void clearAllTimeouts();
-    int installTimeout(ScheduledAction*, int interval, bool singleShot);
-
-    RefPtr<WebCore::DOMWindow> m_impl;
-    OwnPtr<WindowPrivate> d;
-  };
-
-#define FOR_EACH_CLASS(macro) \
-    macro(WindowProtoFuncAToB) \
-    macro(WindowProtoFuncBToA) \
-    macro(WindowProtoFuncOpen) \
-    macro(WindowProtoFuncSetTimeout) \
-    macro(WindowProtoFuncClearTimeout) \
-    macro(WindowProtoFuncSetInterval) \
-    macro(WindowProtoFuncAddEventListener) \
-    macro(WindowProtoFuncRemoveEventListener) \
-    macro(WindowProtoFuncShowModalDialog) \
-    macro(WindowProtoFuncNotImplemented) \
-
-FOR_EACH_CLASS(KJS_IMPLEMENT_PROTOTYPE_FUNCTION_WITH_CREATE)
-#undef FOR_EACH_CLASS
-
 
   /**
@@ -185 +40 @@
     class ScheduledAction {
     public:
-        ScheduledAction(JSValue* func, const List& args);
-        ScheduledAction(const WebCore::String& code)
+        ScheduledAction(KJS::JSValue* func, const KJS::List& args);
+        ScheduledAction(const String& code)
             : m_code(code)
         {
         }
 
-        void execute(Window *);
+        void execute(KJS::Window*);
 
     private:
-        ProtectedPtr<JSValue> m_func;
-        Vector<ProtectedPtr<JSValue> > m_args;
-        WebCore::String m_code;
+        KJS::ProtectedPtr<KJS::JSValue> m_func;
+        Vector<KJS::ProtectedPtr<KJS::JSValue> > m_args;
+        String m_code;
     };
 
-  class Location : public DOMObject {
-    friend class Window;
-  public:
-    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    JSValue* getValueProperty(ExecState*, int token) const;
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue*, int attr = None);
-
-    enum { Hash, Href, Hostname, Host, Pathname, Port, Protocol, Search, 
-           Replace, Reload, ToString, Assign };
-
-    WebCore::Frame* frame() const { return m_frame; }
-
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-
-  private:
-    Location(WebCore::Frame*);
-
-    WebCore::Frame* m_frame;
-  };
-
-#define FOR_EACH_CLASS(macro) \
-    macro(LocationProtoFuncAssign) \
-    macro(LocationProtoFuncToString) \
-    macro(LocationProtoFuncReplace) \
-    macro(LocationProtoFuncReload) \
-
-FOR_EACH_CLASS(KJS_IMPLEMENT_PROTOTYPE_FUNCTION_WITH_CREATE)
-#undef FOR_EACH_CLASS
-
-} // namespace KJS
-
-namespace WebCore {
-    KJS::JSValue* toJS(KJS::ExecState*, DOMWindow*);
 } // namespace WebCore
 
-#endif // kjs_window_h
+#endif // ScheduledAction_h

trunk/WebCore/bindings/js/kjs_window.cpp

@@ -53 +53 @@
 #include "PlugInInfoStore.h"
 #include "RenderView.h"
+#include "ScheduledAction.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
@@ -100 +101 @@
 class DOMWindowTimer : public TimerBase {
 public:
-    DOMWindowTimer(int timeoutId, int nestingLevel, Window* object, ScheduledAction* action)
+    DOMWindowTimer(int timeoutId, int nestingLevel, Window* object, WebCore::ScheduledAction* action)
         : m_timeoutId(timeoutId)
         , m_nestingLevel(nestingLevel)
@@ -119 +120 @@
     void setNestingLevel(int n) { m_nestingLevel = n; }
 
-    ScheduledAction* action() const { return m_action; }
-    ScheduledAction* takeAction() { ScheduledAction* a = m_action; m_action = 0; return a; }
+    WebCore::ScheduledAction* action() const { return m_action; }
+    WebCore::ScheduledAction* takeAction() { WebCore::ScheduledAction* a = m_action; m_action = 0; return a; }
 
 private:
@@ -128 +129 @@
     int m_nestingLevel;
     Window* m_object;
-    ScheduledAction* m_action;
+    WebCore::ScheduledAction* m_action;
 };
 
@@ -1203 +1204 @@
 }
 
-////////////////////// ScheduledAction ////////////////////////
-
-void ScheduledAction::execute(Window* window)
-{
-    RefPtr<Frame> frame = window->impl()->frame();
-    if (!frame)
-        return;
-
-    KJSProxy* scriptProxy = frame->scriptProxy();
-    if (!scriptProxy)
-        return;
-
-    Window* globalObject = scriptProxy->globalObject();
-
-    scriptProxy->setProcessingTimerCallback(true);
-
-    if (JSValue* func = m_func.get()) {
-        JSLock lock;
-        if (func->isObject() && static_cast<JSObject*>(func)->implementsCall()) {
-            ExecState* exec = window->globalExec();
-            ASSERT(window == globalObject);
-
-            List args;
-            size_t size = m_args.size();
-            for (size_t i = 0; i < size; ++i) {
-                args.append(m_args[i]);
-            }
-
-            globalObject->startTimeoutCheck();
-            static_cast<JSObject*>(func)->call(exec, window, args);
-            globalObject->stopTimeoutCheck();
-            if (exec->hadException()) {
-                JSObject* exception = exec->exception()->toObject(exec);
-                exec->clearException();
-                String message = exception->get(exec, exec->propertyNames().message)->toString(exec);
-                int lineNumber = exception->get(exec, "line")->toInt32(exec);
-                if (Interpreter::shouldPrintExceptions())
-                    printf("(timer):%s\n", message.utf8().data());
-                if (Page* page = frame->page())
-                    page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, String());
-            }
-        }
-    } else
-        frame->loader()->executeScript(m_code);
-
-    // Update our document's rendering following the execution of the timeout callback.
-    // FIXME: Why not use updateDocumentsRendering to update rendering of all documents?
-    // FIXME: Is this really the right point to do the update? We need a place that works
-    // for all possible entry points that might possibly execute script, but this seems
-    // to be a bit too low-level.
-    if (Document* doc = frame->document())
-        doc->updateRendering();
-
-    scriptProxy->setProcessingTimerCallback(false);
-}
-
 ////////////////////// timeouts ////////////////////////
 
@@ -1267 +1212 @@
 }
 
-int Window::installTimeout(ScheduledAction* a, int t, bool singleShot)
+int Window::installTimeout(WebCore::ScheduledAction* a, int t, bool singleShot)
 {
     int timeoutId = ++lastUsedTimeoutId;
@@ -1292 +1237 @@
 }
 
-ScheduledAction::ScheduledAction(JSValue* func, const List& args)
-    : m_func(func)
-{
-    List::const_iterator end = args.end();
-    for (List::const_iterator it = args.begin(); it != end; ++it)
-        m_args.append(*it);
-}
-
 int Window::installTimeout(const UString& handler, int t, bool singleShot)
 {
-    return installTimeout(new ScheduledAction(handler), t, singleShot);
+    return installTimeout(new WebCore::ScheduledAction(handler), t, singleShot);
 }
 
 int Window::installTimeout(JSValue* func, const List& args, int t, bool singleShot)
 {
-    return installTimeout(new ScheduledAction(func, args), t, singleShot);
+    return installTimeout(new WebCore::ScheduledAction(func, args), t, singleShot);
 }
 
@@ -1379 +1316 @@
 
     // Delete timer before executing the action for one-shot timers.
-    ScheduledAction* action = timer->takeAction();
+    WebCore::ScheduledAction* action = timer->takeAction();
     d->m_timeouts.remove(timer->timeoutId());
     delete timer;

trunk/WebCore/bindings/js/kjs_window.h

@@ -35 +35 @@
     class JSUnprotectedEventListener;
     class PausedTimeouts;
+    class ScheduledAction;
 }
 
@@ -41 +42 @@
     class DOMWindowTimer;
     class Location;
-    class ScheduledAction;
     class Window;
     class WindowFunc;
@@ -49 +49 @@
   class Window : public JSGlobalObject {
     friend class Location;
-    friend class ScheduledAction;
+    friend class WebCore::ScheduledAction;
   protected:
     Window(WebCore::DOMWindow*);
@@ -156 +156 @@
     void clearHelperObjectProperties();
     void clearAllTimeouts();
-    int installTimeout(ScheduledAction*, int interval, bool singleShot);
+    int installTimeout(WebCore::ScheduledAction*, int interval, bool singleShot);
 
     RefPtr<WebCore::DOMWindow> m_impl;
@@ -178 +178 @@
 
 
-  /**
-   * An action (either function or string) to be executed after a specified
-   * time interval, either once or repeatedly. Used for window.setTimeout()
-   * and window.setInterval()
-   */
-    class ScheduledAction {
-    public:
-        ScheduledAction(JSValue* func, const List& args);
-        ScheduledAction(const WebCore::String& code)
-            : m_code(code)
-        {
-        }
-
-        void execute(Window *);
-
-    private:
-        ProtectedPtr<JSValue> m_func;
-        Vector<ProtectedPtr<JSValue> > m_args;
-        WebCore::String m_code;
-    };
-
   class Location : public DOMObject {
     friend class Window;