2008-05-03 Sam Weinig <sam@webkit.org>
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 4 May 2008 00:02:10 +0000 (00:02 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 4 May 2008 00:02:10 +0000 (00:02 +0000)
        Rubber-stamped by Geoffrey Garen.

        Rename JSDOMWindowWrapper to JSDOMWindowShell.

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

25 files changed:
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/bindings/js/JSDOMWindowBase.cpp
WebCore/bindings/js/JSDOMWindowBase.h
WebCore/bindings/js/JSDOMWindowCustom.cpp
WebCore/bindings/js/JSDOMWindowShell.cpp [moved from WebCore/bindings/js/JSDOMWindowWrapper.cpp with 64% similarity]
WebCore/bindings/js/JSDOMWindowShell.h [moved from WebCore/bindings/js/JSDOMWindowWrapper.h with 93% similarity]
WebCore/bindings/js/JSDocumentCustom.cpp
WebCore/bindings/js/JSHTMLDocumentCustom.cpp
WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
WebCore/bindings/js/ScheduledAction.cpp
WebCore/bindings/js/ScheduledAction.h
WebCore/bindings/js/kjs_proxy.cpp
WebCore/bindings/js/kjs_proxy.h
WebCore/bindings/objc/DOMUtility.mm
WebCore/bindings/scripts/CodeGeneratorJS.pm
WebCore/history/CachedPage.cpp
WebCore/loader/FrameLoader.cpp
WebCore/page/Frame.cpp
WebCore/page/InspectorController.cpp
WebCore/page/mac/FrameMac.mm

index 93c9857..b800ab3 100644 (file)
@@ -1,3 +1,9 @@
+2008-05-03  Sam Weinig  <sam@webkit.org>
+
+        Rubber-stamped by Geoffrey Garen.
+
+        Rename JSDOMWindowWrapper to JSDOMWindowShell.
+
 2008-05-01  Rob Buis  <buis@kde.org>
 
         Reviewed by Eric.
index 06f320a..68eb146 100644 (file)
@@ -492,7 +492,7 @@ webcore_sources += \
        WebCore/bindings/js/JSDocumentCustom.cpp \
        WebCore/bindings/js/JSDOMWindowBase.cpp \
        WebCore/bindings/js/JSDOMWindowCustom.cpp \
-       WebCore/bindings/js/JSDOMWindowWrapper.cpp \
+       WebCore/bindings/js/JSDOMWindowShell.cpp \
        WebCore/bindings/js/JSElementCustom.cpp \
        WebCore/bindings/js/JSEventCustom.cpp \
        WebCore/bindings/js/JSEventTargetBase.cpp \
index 7b4a9d3..9fb31cf 100644 (file)
@@ -434,7 +434,7 @@ SOURCES += \
     bindings/js/JSDocumentCustom.cpp \
     bindings/js/JSDOMWindowBase.cpp \
     bindings/js/JSDOMWindowCustom.cpp \
-    bindings/js/JSDOMWindowWrapper.cpp \
+    bindings/js/JSDOMWindowShell.cpp \
     bindings/js/JSElementCustom.cpp \
     bindings/js/JSEventCustom.cpp \
     bindings/js/JSEventTargetBase.cpp \
index 54302a9..54aa5ad 100644 (file)
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\JSDOMWindowWrapper.cpp"\r
+                                       RelativePath="..\bindings\js\JSDOMWindowShell.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\JSDOMWindowWrapper.h"\r
+                                       RelativePath="..\bindings\js\JSDOMWindowShell.h"\r
                                        >\r
                                </File>\r
                                <File\r
index 2126ee9..cb56fa5 100644 (file)
                BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC348BD20DB7F804004ABAB9 /* JSXMLHttpRequest.h */; };
                BC348BE90DB80354004ABAB9 /* JSXMLHttpRequestConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC348BE70DB80354004ABAB9 /* JSXMLHttpRequestConstructor.cpp */; };
                BC348BEA0DB80354004ABAB9 /* JSXMLHttpRequestConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC348BE80DB80354004ABAB9 /* JSXMLHttpRequestConstructor.h */; };
-               BC3A9E880DA2E18200A05E6A /* JSDOMWindowWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3A9E860DA2E18200A05E6A /* JSDOMWindowWrapper.cpp */; };
-               BC3A9E890DA2E18200A05E6A /* JSDOMWindowWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3A9E870DA2E18200A05E6A /* JSDOMWindowWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */; };
                BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */; };
                BC3FCAA90AC3DB5800BA54AD /* PlatformScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3FCAA80AC3DB5800BA54AD /* PlatformScrollBar.h */; settings = {ATTRIBUTES = (); }; };
                BCB773610C17853D00132BA4 /* JSNodeFilterCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */; };
                BCB773620C17853D00132BA4 /* JSNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */; };
                BCB773630C17853D00132BA4 /* JSNodeFilterCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */; };
+               BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */; };
+               BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */; };
                BCC573350D695BBE006EF517 /* DOMProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC573330D695BBE006EF517 /* DOMProgressEvent.h */; };
                BCC573360D695BBE006EF517 /* DOMProgressEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC573340D695BBE006EF517 /* DOMProgressEvent.mm */; };
                BCC573380D695BD7006EF517 /* DOMProgressEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC573370D695BD7006EF517 /* DOMProgressEventInternal.h */; };
                BC348BD20DB7F804004ABAB9 /* JSXMLHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequest.h; sourceTree = "<group>"; };
                BC348BE70DB80354004ABAB9 /* JSXMLHttpRequestConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestConstructor.cpp; sourceTree = "<group>"; };
                BC348BE80DB80354004ABAB9 /* JSXMLHttpRequestConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequestConstructor.h; sourceTree = "<group>"; };
-               BC3A9E860DA2E18200A05E6A /* JSDOMWindowWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowWrapper.cpp; sourceTree = "<group>"; };
-               BC3A9E870DA2E18200A05E6A /* JSDOMWindowWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowWrapper.h; sourceTree = "<group>"; };
                BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaList.cpp; sourceTree = "<group>"; };
                BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMediaList.h; sourceTree = "<group>"; };
                BC3FCAA80AC3DB5800BA54AD /* PlatformScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformScrollBar.h; sourceTree = "<group>"; };
                BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCondition.cpp; sourceTree = "<group>"; };
                BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilterCondition.h; sourceTree = "<group>"; };
                BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCustom.cpp; sourceTree = "<group>"; };
+               BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowShell.cpp; sourceTree = "<group>"; };
+               BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowShell.h; sourceTree = "<group>"; };
                BCC573330D695BBE006EF517 /* DOMProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMProgressEvent.h; sourceTree = "<group>"; };
                BCC573340D695BBE006EF517 /* DOMProgressEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMProgressEvent.mm; sourceTree = "<group>"; };
                BCC573370D695BD7006EF517 /* DOMProgressEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMProgressEventInternal.h; sourceTree = "<group>"; };
                                E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
                                BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */,
                                BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */,
-                               BC3A9E860DA2E18200A05E6A /* JSDOMWindowWrapper.cpp */,
-                               BC3A9E870DA2E18200A05E6A /* JSDOMWindowWrapper.h */,
+                               BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */,
+                               BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */,
                                B25BE50E0D06B70800B524C6 /* JSEventTargetBase.cpp */,
                                B25BE50F0D06B70800B524C6 /* JSEventTargetBase.h */,
                                BCD9C26A0C17AA81005C90A2 /* JSEventTargetNode.cpp */,
                                E415F1840D9A1A830033CE97 /* ElementTimeControl.h in Headers */,
                                650FBF2B0D9AF047008FC292 /* SVGHKernElement.h in Headers */,
                                37ACCE420DA2980F0089E602 /* FontRenderingMode.h in Headers */,
-                               BC3A9E890DA2E18200A05E6A /* JSDOMWindowWrapper.h in Headers */,
                                51E0BABB0DA5547100A9E417 /* StorageEvent.h in Headers */,
                                51E0BAEB0DA55D4A00A9E417 /* JSStorageEvent.h in Headers */,
                                51E0BB230DA572A600A9E417 /* SessionStorage.h in Headers */,
                                1A219B3B0DCA87AB0040E3A0 /* npfunctions.h in Headers */,
                                BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */,
                                BCE99EC40DCA624100182683 /* JSXSLTProcessorConstructor.h in Headers */,
+                               BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */,
                                BCE1C43B0D9830D3003B02F2 /* JSLocation.cpp in Sources */,
                                BCE1C4400D9830F4003B02F2 /* JSLocationCustom.cpp in Sources */,
-                               BC3A9E880DA2E18200A05E6A /* JSDOMWindowWrapper.cpp in Sources */,
                                51E3F9C70DA059DC00250911 /* Storage.cpp in Sources */,
                                51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */,
                                51E0BABC0DA5547100A9E417 /* StorageEvent.cpp in Sources */,
                                BCEFE1E50DCA5F3300739219 /* JSXSLTProcessorCustom.cpp in Sources */,
                                BCEFE1EA0DCA5F6400739219 /* JSXSLTProcessor.cpp in Sources */,
                                BCE99EC30DCA624100182683 /* JSXSLTProcessorConstructor.cpp in Sources */,
+                               BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 644f907..32c0033 100644 (file)
@@ -53,7 +53,7 @@ This file contains the list of files needed to build WebCore.
         bindings/js/JSDOMApplicationCacheCustom.cpp
         bindings/js/JSDOMWindowBase.cpp
         bindings/js/JSDOMWindowCustom.cpp
-        bindings/js/JSDOMWindowWrapper.cpp
+        bindings/js/JSDOMWindowShell.cpp
         bindings/js/JSDocumentCustom.cpp
         bindings/js/JSElementCustom.cpp
         bindings/js/JSEventCustom.cpp
index 054cb37..e1e8110 100644 (file)
@@ -83,10 +83,10 @@ const int cMaxTimerNestingLevel = 5;
 const double cMinimumTimerInterval = 0.010;
 
 struct JSDOMWindowBasePrivate {
-    JSDOMWindowBasePrivate(JSDOMWindowWrapper* wrapper)
+    JSDOMWindowBasePrivate(JSDOMWindowShell* shell)
         : m_evt(0)
         , m_returnValueSlot(0)
-        , m_wrapper(wrapper)
+        , m_shell(shell)
     {
     }
 
@@ -96,7 +96,7 @@ struct JSDOMWindowBasePrivate {
     JSDOMWindowBase::UnprotectedListenersMap jsUnprotectedHTMLEventListeners;
     Event* m_evt;
     JSValue** m_returnValueSlot;
-    JSDOMWindowWrapper* m_wrapper;
+    JSDOMWindowShell* m_shell;
 
     typedef HashMap<int, DOMWindowTimer*> TimeoutsMap;
     TimeoutsMap m_timeouts;
@@ -194,10 +194,10 @@ const ClassInfo JSDOMWindowBase::s_info = { "Window", 0, &JSDOMWindowBaseTable,
 @end
 */
 
-JSDOMWindowBase::JSDOMWindowBase(JSObject* prototype, DOMWindow* window, JSDOMWindowWrapper* wrapper)
-    : JSGlobalObject(prototype, wrapper)
+JSDOMWindowBase::JSDOMWindowBase(JSObject* prototype, DOMWindow* window, JSDOMWindowShell* shell)
+    : JSGlobalObject(prototype, shell)
     , m_impl(window)
-    , d(new JSDOMWindowBasePrivate(wrapper))
+    , d(new JSDOMWindowBasePrivate(shell))
 {
     // Time in milliseconds before the script timeout handler kicks in.
     setTimeoutTime(10000);
@@ -929,20 +929,20 @@ Event* JSDOMWindowBase::currentEvent()
 
 JSObject* JSDOMWindowBase::toThisObject(ExecState*) const
 {
-    return wrapper();
+    return shell();
 }
 
-JSDOMWindowWrapper* JSDOMWindowBase::wrapper() const
+JSDOMWindowShell* JSDOMWindowBase::shell() const
 {
-    return d->m_wrapper;
+    return d->m_shell;
 }
 
 JSValue* windowProtoFuncAToB(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -973,9 +973,9 @@ JSValue* windowProtoFuncAToB(ExecState* exec, JSObject* thisObj, const List& arg
 JSValue* windowProtoFuncBToA(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1005,9 +1005,9 @@ JSValue* windowProtoFuncBToA(ExecState* exec, JSObject* thisObj, const List& arg
 JSValue* windowProtoFuncOpen(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1076,9 +1076,9 @@ JSValue* windowProtoFuncOpen(ExecState* exec, JSObject* thisObj, const List& arg
 JSValue* windowProtoFuncSetTimeout(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1098,9 +1098,9 @@ JSValue* windowProtoFuncClearTimeout(ExecState* exec, JSObject* thisObj, const L
 {
     // Also the implementation for window.clearInterval()
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1111,9 +1111,9 @@ JSValue* windowProtoFuncClearTimeout(ExecState* exec, JSObject* thisObj, const L
 JSValue* windowProtoFuncSetInterval(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1136,9 +1136,9 @@ JSValue* windowProtoFuncSetInterval(ExecState* exec, JSObject* thisObj, const Li
 JSValue* windowProtoFuncAddEventListener(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1157,9 +1157,9 @@ JSValue* windowProtoFuncAddEventListener(ExecState* exec, JSObject* thisObj, con
 JSValue* windowProtoFuncRemoveEventListener(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1178,9 +1178,9 @@ JSValue* windowProtoFuncRemoveEventListener(ExecState* exec, JSObject* thisObj,
 JSValue* windowProtoFuncShowModalDialog(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
-    JSDOMWindow* window = static_cast<JSDOMWindowWrapper*>(thisObj)->window();
+    JSDOMWindow* window = static_cast<JSDOMWindowShell*>(thisObj)->window();
     if (!window->allowsAccessFrom(exec))
         return jsUndefined();
 
@@ -1194,7 +1194,7 @@ JSValue* windowProtoFuncShowModalDialog(ExecState* exec, JSObject* thisObj, cons
 JSValue* windowProtoFuncNotImplemented(ExecState* exec, JSObject* thisObj, const List& args)
 {
     ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));
-    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))
+    if (!thisObj->inherits(&JSDOMWindowShell::s_info))
         return throwError(exec, TypeError);
     return jsUndefined();
 }
@@ -1306,7 +1306,7 @@ void JSDOMWindowBase::timerFired(DOMWindowTimer* timer)
     if (timer->isActive()) {
         int timeoutId = timer->timeoutId();
 
-        timer->action()->execute(wrapper());
+        timer->action()->execute(shell());
         // The DOMWindowTimer object may have been deleted or replaced during execution,
         // so we re-fetch it.
         timer = d->m_timeouts.get(timeoutId);
@@ -1325,7 +1325,7 @@ void JSDOMWindowBase::timerFired(DOMWindowTimer* timer)
     ScheduledAction* action = timer->takeAction();
     d->m_timeouts.remove(timer->timeoutId());
     delete timer;
-    action->execute(wrapper());
+    action->execute(shell());
 
     JSLock lock;
     delete action;
@@ -1370,14 +1370,14 @@ JSValue* toJS(ExecState*, DOMWindow* domWindow)
     Frame* frame = domWindow->frame();
     if (!frame)
         return jsNull();
-    return frame->scriptProxy()->windowWrapper();
+    return frame->scriptProxy()->windowShell();
 }
 
 JSDOMWindow* toJSDOMWindow(Frame* frame)
 {
     if (!frame)
         return 0;
-    return frame->scriptProxy()->windowWrapper()->window();
+    return frame->scriptProxy()->windowShell()->window();
 }
 
 JSDOMWindow* asJSDOMWindow(JSGlobalObject* globalObject)
index 60518f5..082709a 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
     class DOMWindowTimer;
     class Frame;
     class JSDOMWindow;
-    class JSDOMWindowWrapper;
+    class JSDOMWindowShell;
     class JSEventListener;
     class JSLocation;
     class JSUnprotectedEventListener;
@@ -53,7 +53,7 @@ namespace WebCore {
 
         friend class ScheduledAction;
     protected:
-        JSDOMWindowBase(KJS::JSObject* prototype, DOMWindow*, JSDOMWindowWrapper*);
+        JSDOMWindowBase(KJS::JSObject* prototype, DOMWindow*, JSDOMWindowShell*);
 
     public:
         virtual ~JSDOMWindowBase();
@@ -119,7 +119,7 @@ namespace WebCore {
         virtual bool allowsAccessFrom(const KJS::JSGlobalObject*) const;
 
         virtual KJS::JSObject* toThisObject(KJS::ExecState*) const;
-        JSDOMWindowWrapper* wrapper() const;
+        JSDOMWindowShell* shell() const;
 
         enum {
             // Attributes
index 760bbfe..1886920 100644 (file)
@@ -27,7 +27,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include "Settings.h"
 #include "kjs_proxy.h"
 #include <kjs/object.h>
@@ -230,8 +230,8 @@ DOMWindow* toDOMWindow(JSValue* val)
 {
     if (val->isObject(&JSDOMWindow::s_info))
         return static_cast<JSDOMWindow*>(val)->impl();
-    if (val->isObject(&JSDOMWindowWrapper::s_info))
-        return static_cast<JSDOMWindowWrapper*>(val)->impl();
+    if (val->isObject(&JSDOMWindowShell::s_info))
+        return static_cast<JSDOMWindowShell*>(val)->impl();
     return 0;
 }
 
similarity index 64%
rename from WebCore/bindings/js/JSDOMWindowWrapper.cpp
rename to WebCore/bindings/js/JSDOMWindowShell.cpp
index 86cc94d..ee2e0f4 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 
 #include "Frame.h"
 #include "JSDOMWindow.h"
@@ -39,9 +39,9 @@ using namespace KJS;
 
 namespace WebCore {
 
-const ClassInfo JSDOMWindowWrapper::s_info = { "JSDOMWindowWrapper", 0, 0, 0 };
+const ClassInfo JSDOMWindowShell::s_info = { "JSDOMWindowShell", 0, 0, 0 };
 
-JSDOMWindowWrapper::JSDOMWindowWrapper(DOMWindow* domWindow)
+JSDOMWindowShell::JSDOMWindowShell(DOMWindow* domWindow)
     : Base(jsNull())
     , m_window(0)
 {
@@ -49,7 +49,7 @@ JSDOMWindowWrapper::JSDOMWindowWrapper(DOMWindow* domWindow)
     setPrototype(m_window->prototype());
 }
 
-JSDOMWindowWrapper::~JSDOMWindowWrapper()
+JSDOMWindowShell::~JSDOMWindowShell()
 {
 }
 
@@ -57,69 +57,69 @@ JSDOMWindowWrapper::~JSDOMWindowWrapper()
 // JSObject methods
 // ----
 
-void JSDOMWindowWrapper::mark()
+void JSDOMWindowShell::mark()
 {
     Base::mark();
     if (m_window && !m_window->marked())
         m_window->mark();
 }
 
-UString JSDOMWindowWrapper::className() const
+UString JSDOMWindowShell::className() const
 {
     return m_window->className();
 }
 
-bool JSDOMWindowWrapper::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+bool JSDOMWindowShell::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
     return m_window->getOwnPropertySlot(exec, propertyName, slot);
 }
 
-void JSDOMWindowWrapper::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
+void JSDOMWindowShell::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
 {
     m_window->put(exec, propertyName, value);
 }
 
-void JSDOMWindowWrapper::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue* value, unsigned attributes)
+void JSDOMWindowShell::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue* value, unsigned attributes)
 {
     m_window->putWithAttributes(exec, propertyName, value, attributes);
 }
 
-bool JSDOMWindowWrapper::deleteProperty(ExecState* exec, const Identifier& propertyName)
+bool JSDOMWindowShell::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
     return m_window->deleteProperty(exec, propertyName);
 }
 
-void JSDOMWindowWrapper::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+void JSDOMWindowShell::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
     m_window->getPropertyNames(exec, propertyNames);
 }
 
-bool JSDOMWindowWrapper::getPropertyAttributes(KJS::ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
+bool JSDOMWindowShell::getPropertyAttributes(KJS::ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
 {
     return m_window->getPropertyAttributes(exec, propertyName, attributes);
 }
 
-void JSDOMWindowWrapper::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction)
+void JSDOMWindowShell::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction)
 {
     m_window->defineGetter(exec, propertyName, getterFunction);
 }
 
-void JSDOMWindowWrapper::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction)
+void JSDOMWindowShell::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction)
 {
     m_window->defineSetter(exec, propertyName, setterFunction);
 }
 
-JSValue* JSDOMWindowWrapper::lookupGetter(ExecState* exec, const Identifier& propertyName)
+JSValue* JSDOMWindowShell::lookupGetter(ExecState* exec, const Identifier& propertyName)
 {
     return m_window->lookupGetter(exec, propertyName);
 }
 
-JSValue* JSDOMWindowWrapper::lookupSetter(ExecState* exec, const Identifier& propertyName)
+JSValue* JSDOMWindowShell::lookupSetter(ExecState* exec, const Identifier& propertyName)
 {
     return m_window->lookupSetter(exec, propertyName);
 }
 
-JSGlobalObject* JSDOMWindowWrapper::toGlobalObject(ExecState*) const
+JSGlobalObject* JSDOMWindowShell::toGlobalObject(ExecState*) const
 {
     return m_window;
 }
@@ -128,22 +128,22 @@ JSGlobalObject* JSDOMWindowWrapper::toGlobalObject(ExecState*) const
 // JSDOMWindow methods
 // ----
 
-DOMWindow* JSDOMWindowWrapper::impl() const
+DOMWindow* JSDOMWindowShell::impl() const
 {
     return m_window->impl();
 }
 
-void JSDOMWindowWrapper::disconnectFrame()
+void JSDOMWindowShell::disconnectFrame()
 {
     m_window->disconnectFrame();
 }
 
-void JSDOMWindowWrapper::clear()
+void JSDOMWindowShell::clear()
 {
     m_window->clear();
 }
 
-void* JSDOMWindowWrapper::operator new(size_t size)
+void* JSDOMWindowShell::operator new(size_t size)
 {
     return Heap::threadHeap()->allocate(size);
 }
@@ -156,14 +156,14 @@ JSValue* toJS(ExecState*, Frame* frame)
 {
     if (!frame)
         return jsNull();
-    return frame->scriptProxy()->windowWrapper();
+    return frame->scriptProxy()->windowShell();
 }
 
-JSDOMWindowWrapper* toJSDOMWindowWrapper(Frame* frame)
+JSDOMWindowShell* toJSDOMWindowShell(Frame* frame)
 {
     if (!frame)
         return 0;
-    return frame->scriptProxy()->windowWrapper();
+    return frame->scriptProxy()->windowShell();
 }
 
 } // namespace WebCore
similarity index 93%
rename from WebCore/bindings/js/JSDOMWindowWrapper.h
rename to WebCore/bindings/js/JSDOMWindowShell.h
index c6a63f8..4db651c 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef JSDOMWindowWrapper_h
-#define JSDOMWindowWrapper_h
+#ifndef JSDOMWindowShell_h
+#define JSDOMWindowShell_h
 
 #include "JSDOMWindow.h"
 #include "kjs_binding.h"
@@ -37,11 +37,11 @@ namespace WebCore {
     class DOMWindow;
     class Frame;
 
-    class JSDOMWindowWrapper : public DOMObject {
+    class JSDOMWindowShell : public DOMObject {
         typedef DOMObject Base;
     public:
-        JSDOMWindowWrapper(DOMWindow*);
-        virtual ~JSDOMWindowWrapper();
+        JSDOMWindowShell(DOMWindow*);
+        virtual ~JSDOMWindowShell();
 
         JSDOMWindow* window() const { return m_window; }
         void setWindow(JSDOMWindow* window)
@@ -83,8 +83,8 @@ namespace WebCore {
     };
 
     KJS::JSValue* toJS(KJS::ExecState*, Frame*);
-    JSDOMWindowWrapper* toJSDOMWindowWrapper(Frame*);
+    JSDOMWindowShell* toJSDOMWindowShell(Frame*);
 
 } // namespace WebCore
 
-#endif // JSDOMWindowWrapper_h
+#endif // JSDOMWindowShell_h
index 581f88d..c1acbf2 100644 (file)
@@ -93,7 +93,7 @@ JSValue* toJS(ExecState* exec, Document* doc)
     // Make sure the document is kept around by the window object, and works right with the
     // back/forward cache.
     if (doc->frame())
-        toJSDOMWindowWrapper(doc->frame())->window()->putDirect("document", ret, DontDelete|ReadOnly);
+        toJSDOMWindowShell(doc->frame())->window()->putDirect("document", ret, DontDelete|ReadOnly);
     else {
         size_t nodeCount = 0;
         for (Node* n = doc; n; n = n->traverseNextNode())
index 507925f..084338c 100644 (file)
@@ -34,7 +34,7 @@
 #include "HTMLIFrameElement.h"
 #include "HTMLNames.h"
 #include "JSDOMWindow.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include "JSHTMLCollection.h"
 #include "kjs_html.h"
 
@@ -100,7 +100,7 @@ JSValue* JSHTMLDocument::open(ExecState* exec, const List& args)
     if (args.size() > 2) {
         Frame* frame = static_cast<HTMLDocument*>(impl())->frame();
         if (frame) {
-            JSDOMWindowWrapper* wrapper = toJSDOMWindowWrapper(frame);
+            JSDOMWindowShell* wrapper = toJSDOMWindowShell(frame);
             if (wrapper) {
                 JSObject* functionObject = wrapper->get(exec, "open")->getObject();
                 if (!functionObject || !functionObject->implementsCall())
index ec549b8..28ef6d2 100644 (file)
@@ -31,7 +31,7 @@
 #include "HTMLFrameSetElement.h"
 #include "HTMLNames.h"
 #include "JSDOMWindow.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include "kjs_binding.h"
 
 using namespace KJS;
@@ -53,7 +53,7 @@ JSValue* JSHTMLFrameSetElement::nameGetter(ExecState* exec, JSObject* originalOb
 
     Node* frame = element->children()->namedItem(propertyName);
     if (Document* doc = static_cast<HTMLFrameElement*>(frame)->contentDocument()) {
-        if (JSDOMWindowWrapper* window = toJSDOMWindowWrapper(doc->frame()))
+        if (JSDOMWindowShell* window = toJSDOMWindowShell(doc->frame()))
             return window;
     }
 
index 7f86ade..7c23fbc 100644 (file)
@@ -45,9 +45,9 @@ ScheduledAction::ScheduledAction(JSValue* func, const List& args)
 }
 
 
-void ScheduledAction::execute(JSDOMWindowWrapper* windowWrapper)
+void ScheduledAction::execute(JSDOMWindowShell* windowShell)
 {
-    RefPtr<Frame> frame = windowWrapper->window()->impl()->frame();
+    RefPtr<Frame> frame = windowShell->window()->impl()->frame();
     if (!frame)
         return;
 
@@ -62,7 +62,7 @@ void ScheduledAction::execute(JSDOMWindowWrapper* windowWrapper)
     if (JSValue* func = m_func.get()) {
         JSLock lock;
         if (func->isObject() && static_cast<JSObject*>(func)->implementsCall()) {
-            JSDOMWindow* window = windowWrapper->window();
+            JSDOMWindow* window = windowShell->window();
             ExecState* exec = window->globalExec();
 
             List args;
@@ -71,7 +71,7 @@ void ScheduledAction::execute(JSDOMWindowWrapper* windowWrapper)
                 args.append(m_args[i]);
 
             window->startTimeoutCheck();
-            static_cast<JSObject*>(func)->call(exec, windowWrapper, args);
+            static_cast<JSObject*>(func)->call(exec, windowShell, args);
             window->stopTimeoutCheck();
             if (exec->hadException()) {
                 JSObject* exception = exec->exception()->toObject(exec);
index 0b3a36d..54a0db3 100644 (file)
@@ -31,7 +31,7 @@ namespace KJS {
 
 namespace WebCore {
 
-    class JSDOMWindowWrapper;
+    class JSDOMWindowShell;
 
    /**
     * An action (either function or string) to be executed after a specified
@@ -46,7 +46,7 @@ namespace WebCore {
         {
         }
 
-        void execute(JSDOMWindowWrapper*);
+        void execute(JSDOMWindowShell*);
 
     private:
         KJS::ProtectedPtr<KJS::JSValue> m_func;
index 5bd1167..7a003a2 100644 (file)
@@ -57,8 +57,8 @@ KJSProxy::KJSProxy(Frame* frame)
 
 KJSProxy::~KJSProxy()
 {
-    if (m_windowWrapper) {
-        m_windowWrapper = 0;
+    if (m_windowShell) {
+        m_windowShell = 0;
     
         // It's likely that releasing the global object has created a lot of garbage.
         gcController().garbageCollectSoon();
@@ -75,7 +75,7 @@ JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String&
     // and false for <script>doSomething()</script>. Check if it has the
     // expected value in all cases.
     // See smart window.open policy for where this is used.
-    ExecState* exec = m_windowWrapper->window()->globalExec();
+    ExecState* exec = m_windowShell->window()->globalExec();
     m_processingInlineCode = filename.isNull();
 
     JSLock lock;
@@ -84,9 +84,9 @@ JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String&
     // so we start the keep alive timer here.
     m_frame->keepAlive();
 
-    m_windowWrapper->window()->startTimeoutCheck();
-    Completion comp = Interpreter::evaluate(exec, filename, baseLine, str.characters(), str.length(), m_windowWrapper);
-    m_windowWrapper->window()->stopTimeoutCheck();
+    m_windowShell->window()->startTimeoutCheck();
+    Completion comp = Interpreter::evaluate(exec, filename, baseLine, str.characters(), str.length(), m_windowShell);
+    m_windowShell->window()->stopTimeoutCheck();
 
     if (comp.complType() == Normal || comp.complType() == ReturnValue) {
         m_processingInlineCode = false;
@@ -106,15 +106,15 @@ JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String&
 
 void KJSProxy::clear()
 {
-    if (!m_windowWrapper)
+    if (!m_windowShell)
         return;
 
     JSLock lock;
-    m_windowWrapper->window()->clear();
-    m_windowWrapper->setWindow(new JSDOMWindow(m_frame->domWindow(), m_windowWrapper));
+    m_windowShell->window()->clear();
+    m_windowShell->setWindow(new JSDOMWindow(m_frame->domWindow(), m_windowShell));
     if (Page* page = m_frame->page()) {
         attachDebugger(page->debugger());
-        m_windowWrapper->window()->setPageGroupIdentifier(page->group().identifier());
+        m_windowShell->window()->setPageGroupIdentifier(page->group().identifier());
     }
 
     // There is likely to be a lot of garbage now.
@@ -125,7 +125,7 @@ EventListener* KJSProxy::createHTMLEventHandler(const String& functionName, cons
 {
     initScriptIfNeeded();
     JSLock lock;
-    return new JSLazyEventListener(functionName, code, m_windowWrapper->window(), node, m_handlerLineno);
+    return new JSLazyEventListener(functionName, code, m_windowShell->window(), node, m_handlerLineno);
 }
 
 #if ENABLE(SVG)
@@ -133,7 +133,7 @@ EventListener* KJSProxy::createSVGEventHandler(const String& functionName, const
 {
     initScriptIfNeeded();
     JSLock lock;
-    return new JSSVGLazyEventListener(functionName, code, m_windowWrapper->window(), node, m_handlerLineno);
+    return new JSSVGLazyEventListener(functionName, code, m_windowShell->window(), node, m_handlerLineno);
 }
 #endif
 
@@ -148,16 +148,16 @@ void KJSProxy::finishedWithEvent(Event* event)
 
 void KJSProxy::initScript()
 {
-    if (m_windowWrapper)
+    if (m_windowShell)
         return;
 
     JSLock lock;
 
-    m_windowWrapper = new JSDOMWindowWrapper(m_frame->domWindow());
+    m_windowShell = new JSDOMWindowShell(m_frame->domWindow());
 
     if (Page* page = m_frame->page()) {
         attachDebugger(page->debugger());
-        m_windowWrapper->window()->setPageGroupIdentifier(page->group().identifier());
+        m_windowShell->window()->setPageGroupIdentifier(page->group().identifier());
     }
 
     m_frame->loader()->dispatchWindowObjectAvailable();
@@ -165,19 +165,19 @@ void KJSProxy::initScript()
 
 void KJSProxy::clearDocumentWrapper() 
 {
-    if (!m_windowWrapper)
+    if (!m_windowShell)
         return;
 
     JSLock lock;
-    m_windowWrapper->window()->removeDirect("document");
+    m_windowShell->window()->removeDirect("document");
 }
 
 bool KJSProxy::processingUserGesture() const
 {
-    if (!m_windowWrapper)
+    if (!m_windowShell)
         return false;
 
-    if (Event* event = m_windowWrapper->window()->currentEvent()) {
+    if (Event* event = m_windowShell->window()->currentEvent()) {
         const AtomicString& type = event->type();
         if ( // mouse events
             type == clickEvent || type == mousedownEvent ||
@@ -208,13 +208,13 @@ bool KJSProxy::isEnabled()
 
 void KJSProxy::attachDebugger(KJS::Debugger* debugger)
 {
-    if (!m_windowWrapper)
+    if (!m_windowShell)
         return;
 
     if (debugger)
-        debugger->attach(m_windowWrapper->window());
-    else if (KJS::Debugger* currentDebugger = m_windowWrapper->window()->debugger())
-        currentDebugger->detach(m_windowWrapper->window());
+        debugger->attach(m_windowShell->window());
+    else if (KJS::Debugger* currentDebugger = m_windowShell->window()->debugger())
+        currentDebugger->detach(m_windowShell->window());
 }
 
 } // namespace WebCore
index 5cf9ee2..63a6134 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef kjs_proxy_h
 #define kjs_proxy_h
 
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include <kjs/protect.h>
 #include <wtf/RefPtr.h>
 
@@ -45,17 +45,17 @@ public:
     KJSProxy(Frame*);
     ~KJSProxy();
 
-    bool haveWindowWrapper() const { return m_windowWrapper; }
-    JSDOMWindowWrapper* windowWrapper()
+    bool haveWindowShell() const { return m_windowShell; }
+    JSDOMWindowShell* windowShell()
     {
         initScriptIfNeeded();
-        return m_windowWrapper;
+        return m_windowShell;
     }
 
     JSDOMWindow* globalObject()
     {
         initScriptIfNeeded();
-        return m_windowWrapper->window();
+        return m_windowShell->window();
     }
 
     KJS::JSValue* evaluate(const String& filename, int baseLine, const String& code);
@@ -82,12 +82,12 @@ public:
 private:
     void initScriptIfNeeded()
     {
-        if (!m_windowWrapper)
+        if (!m_windowShell)
             initScript();
     }
     void initScript();
 
-    KJS::ProtectedPtr<JSDOMWindowWrapper> m_windowWrapper;
+    KJS::ProtectedPtr<JSDOMWindowShell> m_windowShell;
     Frame* m_frame;
     int m_handlerLineno;
     
index e545283..3e1fb18 100644 (file)
@@ -35,7 +35,7 @@
 #import "JSCounter.h"
 #import "JSDOMImplementation.h"
 #import "JSDOMWindow.h"
-#import "JSDOMWindowWrapper.h"
+#import "JSDOMWindowShell.h"
 #import "JSEvent.h"
 #import "JSHTMLCollection.h"
 #import "JSHTMLOptionsCollection.h"
@@ -100,8 +100,8 @@ static inline id createDOMWrapper(KJS::JSObject* object)
 
     #undef WRAP
 
-    if (object->inherits(&WebCore::JSDOMWindowWrapper::s_info))
-        return [DOMAbstractView _wrapAbstractView:static_cast<WebCore::JSDOMWindowWrapper*>(object)->impl()];
+    if (object->inherits(&WebCore::JSDOMWindowShell::s_info))
+        return [DOMAbstractView _wrapAbstractView:static_cast<WebCore::JSDOMWindowShell*>(object)->impl()];
 
     if (object->inherits(&WebCore::JSDOMImplementation::s_info))
         return [DOMImplementation _wrapDOMImplementation:implementationFront(static_cast<WebCore::JSDOMImplementation*>(object))];
index b69d779..06146ae 100644 (file)
@@ -304,7 +304,7 @@ sub GenerateHeader
 
     # Implementation class forward declaration
     AddClassForwardIfNeeded($implClassName) unless $podType;
-    AddClassForwardIfNeeded("JSDOMWindowWrapper") if $interfaceName eq "DOMWindow";
+    AddClassForwardIfNeeded("JSDOMWindowShell") if $interfaceName eq "DOMWindow";
 
     # Class declaration
     push(@headerContent, "class $className : public $parentClassName {\n");
@@ -313,7 +313,7 @@ sub GenerateHeader
 
     # Constructor
     if ($interfaceName eq "DOMWindow") {
-        push(@headerContent, "    $className($passType, JSDOMWindowWrapper*);\n");
+        push(@headerContent, "    $className($passType, JSDOMWindowShell*);\n");
     } else {
         push(@headerContent, "    $className(KJS::JSObject* prototype, $passType" . (IsSVGTypeNeedingContextParameter($implClassName) ? ", SVGElement* context" : "") .");\n");
     }
@@ -797,9 +797,9 @@ sub GenerateImplementation
 
     # Constructor
     if ($interfaceName eq "DOMWindow") {
-        AddIncludesForType("JSDOMWindowWrapper");
-        push(@implContent, "${className}::$className($passType impl, JSDOMWindowWrapper* wrapper)\n");
-        push(@implContent, "    : $parentClassName(${className}Prototype::self(), impl, wrapper)\n");
+        AddIncludesForType("JSDOMWindowShell");
+        push(@implContent, "${className}::$className($passType impl, JSDOMWindowShell* shell)\n");
+        push(@implContent, "    : $parentClassName(${className}Prototype::self(), impl, shell)\n");
     } else {
         push(@implContent, "${className}::$className(JSObject* prototype, $passType impl" . ($needsSVGContext ? ", SVGElement* context" : "") . ")\n");
         if ($hasParent) {
@@ -1147,11 +1147,11 @@ sub GenerateImplementation
             push(@implContent, "{\n");
 
             if ($interfaceName eq "DOMWindow") {
-                AddIncludesForType("JSDOMWindowWrapper");
+                AddIncludesForType("JSDOMWindowShell");
                 push(@implContent, "    ASSERT(!thisObj->inherits(&JSDOMWindow::s_info));\n");
-                push(@implContent, "    if (!thisObj->inherits(&JSDOMWindowWrapper::s_info))\n");
+                push(@implContent, "    if (!thisObj->inherits(&JSDOMWindowShell::s_info))\n");
                 push(@implContent, "        return throwError(exec, TypeError);\n");
-                push(@implContent, "    $className* castedThisObj = static_cast<JSDOMWindowWrapper*>(thisObj)->window();\n");
+                push(@implContent, "    $className* castedThisObj = static_cast<JSDOMWindowShell*>(thisObj)->window();\n");
             } else {
                 push(@implContent, "    if (!thisObj->inherits(&${className}::s_info))\n");
                 push(@implContent, "        return throwError(exec, TypeError);\n");
index 0b82976..db240cb 100644 (file)
@@ -38,7 +38,7 @@
 #include "FrameView.h"
 #include "GCController.h"
 #include "JSDOMWindow.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include "Logging.h"
 #include "Page.h"
 #include "PageGroup.h"
@@ -95,8 +95,8 @@ CachedPage::CachedPage(Page* page)
     JSLock lock;
 
     KJSProxy* proxy = mainFrame->scriptProxy();
-    if (proxy->haveWindowWrapper()) {
-        m_window = proxy->windowWrapper()->window();
+    if (proxy->haveWindowShell()) {
+        m_window = proxy->windowShell()->window();
         m_pausedTimeouts.set(m_window->pauseTimeouts());
     }
 
@@ -121,15 +121,15 @@ void CachedPage::restore(Page* page)
     JSLock lock;
 
     KJSProxy* proxy = mainFrame->scriptProxy();
-    if (proxy->haveWindowWrapper()) {
-        JSDOMWindowWrapper* windowWrapper = proxy->windowWrapper();
+    if (proxy->haveWindowShell()) {
+        JSDOMWindowShell* windowShell = proxy->windowShell();
         if (m_window) {
-            windowWrapper->setWindow(m_window.get());
-            windowWrapper->window()->resumeTimeouts(m_pausedTimeouts.get());
+            windowShell->setWindow(m_window.get());
+            windowShell->window()->resumeTimeouts(m_pausedTimeouts.get());
         } else {
-            windowWrapper->setWindow(new JSDOMWindow(mainFrame->domWindow(), windowWrapper));
+            windowShell->setWindow(new JSDOMWindow(mainFrame->domWindow(), windowShell));
             proxy->attachDebugger(page->debugger());
-            windowWrapper->window()->setPageGroupIdentifier(page->group().identifier());
+            windowShell->window()->setPageGroupIdentifier(page->group().identifier());
         }
     }
 
index 1186a0c..f9a7114 100644 (file)
@@ -4735,7 +4735,7 @@ String FrameLoader::referrer() const
 
 void FrameLoader::dispatchWindowObjectAvailable()
 {
-    if (!m_frame->scriptProxy()->isEnabled() || !m_frame->scriptProxy()->haveWindowWrapper())
+    if (!m_frame->scriptProxy()->isEnabled() || !m_frame->scriptProxy()->haveWindowShell())
         return;
 
     m_client->windowObjectCleared();
index 380821d..b015554 100644 (file)
@@ -52,7 +52,7 @@
 #include "HTMLNames.h"
 #include "HTMLTableCellElement.h"
 #include "HitTestResult.h"
-#include "JSDOMWindowWrapper.h"
+#include "JSDOMWindowShell.h"
 #include "Logging.h"
 #include "MediaFeatureNames.h"
 #include "NP_jsobject.h"
@@ -173,8 +173,8 @@ Frame::~Frame()
     --FrameCounter::count;
 #endif
 
-    if (d->m_jscript.haveWindowWrapper())
-        d->m_jscript.windowWrapper()->disconnectFrame();
+    if (d->m_jscript.haveWindowShell())
+        d->m_jscript.windowShell()->disconnectFrame();
 
     disconnectOwnerElement();
     
@@ -1722,9 +1722,9 @@ void Frame::pageDestroyed()
         d->m_page->focusController()->setFocusedFrame(0);
 
     // This will stop any JS timers
-    if (d->m_jscript.haveWindowWrapper()) {
-        if (JSDOMWindowWrapper* windowWrapper = toJSDOMWindowWrapper(this))
-            windowWrapper->disconnectFrame();
+    if (d->m_jscript.haveWindowShell()) {
+        if (JSDOMWindowShell* windowShell = toJSDOMWindowShell(this))
+            windowShell->disconnectFrame();
     }
 
     clearScriptObjects();
index ecbe5be..a7239e2 100644 (file)
@@ -464,7 +464,7 @@ static JSValueRef getResourceDocumentNode(JSContextRef ctx, JSObjectRef /*functi
     if (document->isPluginDocument() || document->isImageDocument())
         return undefined;
 
-    ExecState* exec = toJSDOMWindowWrapper(resource->frame.get())->window()->globalExec();
+    ExecState* exec = toJSDOMWindowShell(resource->frame.get())->window()->globalExec();
 
     KJS::JSLock lock;
     JSValueRef documentValue = toRef(JSInspectedObjectWrapper::wrap(exec, toJS(exec, document)));
index 6efe0e3..11e8cc4 100644 (file)
@@ -600,7 +600,7 @@ WebScriptObject* Frame::windowScriptObject()
 
     if (!d->m_windowScriptObject) {
         KJS::JSLock lock;
-        KJS::JSObject* win = toJSDOMWindowWrapper(this);
+        KJS::JSObject* win = toJSDOMWindowShell(this);
         KJS::Bindings::RootObject *root = bindingRootObject();
         d->m_windowScriptObject = [WebScriptObject scriptObjectForJSObject:toRef(win) originRootObject:root rootObject:root];
     }