Changeset 230867 in webkit

Timestamp:

Apr 20, 2018 4:48:50 PM (6 years ago)

Author:

Chris Dumez

Message:

Use WindowProxy in DOMWindow.idl
​https://bugs.webkit.org/show_bug.cgi?id=184820

Reviewed by Sam Weinig.

Use WindowProxy in DOMWindow.idl to match the specification more closely.

• bindings/js/JSWindowProxy.h:
• bindings/js/WindowProxy.cpp:

(WebCore::WindowProxy::window const):

• bindings/js/WindowProxy.h:
• bindings/scripts/CodeGeneratorJS.pm:

(NativeToJSValueDOMConvertNeedsState):

• dom/Document.cpp:
• dom/Document.h:
• dom/Document.idl:
• page/DOMWindow.cpp:

(WebCore::DOMWindow::focus):
(WebCore::DOMWindow::self const):
(WebCore::DOMWindow::opener const):
(WebCore::DOMWindow::parent const):
(WebCore::DOMWindow::top const):
(WebCore::DOMWindow::open):

• page/DOMWindow.h:
• page/DOMWindow.idl:
• testing/Internals.cpp:

(WebCore::Internals::openDummyInspectorFrontend):

• testing/Internals.h:
• testing/Internals.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSWindowProxy.h (modified) (1 diff)
• bindings/js/WindowProxy.cpp (modified) (1 diff)
• bindings/js/WindowProxy.h (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (2 diffs)
• dom/Document.idl (modified) (1 diff)
• page/DOMWindow.cpp (modified) (7 diffs)
• page/DOMWindow.h (modified) (2 diffs)
• page/DOMWindow.idl (modified) (2 diffs)
• testing/Internals.cpp (modified) (3 diffs)
• testing/Internals.h (modified) (1 diff)
• testing/Internals.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-20  Chris Dumez  <cdumez@apple.com>
+
+        Use WindowProxy in DOMWindow.idl
+        https://bugs.webkit.org/show_bug.cgi?id=184820
+
+        Reviewed by Sam Weinig.
+
+        Use WindowProxy in DOMWindow.idl to match the specification more closely.
+
+        * bindings/js/JSWindowProxy.h:
+        * bindings/js/WindowProxy.cpp:
+        (WebCore::WindowProxy::window const):
+        * bindings/js/WindowProxy.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (NativeToJSValueDOMConvertNeedsState):
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/Document.idl:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::focus):
+        (WebCore::DOMWindow::self const):
+        (WebCore::DOMWindow::opener const):
+        (WebCore::DOMWindow::parent const):
+        (WebCore::DOMWindow::top const):
+        (WebCore::DOMWindow::open):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+        * testing/Internals.cpp:
+        (WebCore::Internals::openDummyInspectorFrontend):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2018-04-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/bindings/js/JSWindowProxy.h

@@ -70 +70 @@
 // JSWindowProxy is a little odd in that it's not a traditional wrapper and has no back pointer.
 // It is, however, strongly owned by AbstractFrame via its WindowProxy, so we can get one from a WindowProxy.
-JSC::JSValue toJS(JSC::ExecState*, WindowProxy&);
+WEBCORE_EXPORT JSC::JSValue toJS(JSC::ExecState*, WindowProxy&);
 inline JSC::JSValue toJS(JSC::ExecState* state, WindowProxy* windowProxy) { return windowProxy ? toJS(state, *windowProxy) : JSC::jsNull(); }
+inline JSC::JSValue toJS(JSC::ExecState* state, const RefPtr<WindowProxy>& windowProxy) { return toJS(state, windowProxy.get()); }
 
 JSWindowProxy& toJSWindowProxy(WindowProxy&, DOMWrapperWorld&);

trunk/Source/WebCore/bindings/js/WindowProxy.cpp

@@ -166 +166 @@
 }
 
+AbstractDOMWindow* WindowProxy::window() const
+{
+    return m_frame.window();
+}
+
+void WindowProxy::ref()
+{
+    m_frame.ref();
+}
+
+void WindowProxy::deref()
+{
+    m_frame.deref();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/WindowProxy.h

@@ -76 +76 @@
     void attachDebugger(JSC::Debugger*); // Attaches/detaches in all worlds/window proxies.
 
+    WEBCORE_EXPORT AbstractDOMWindow* window() const;
+
+    WEBCORE_EXPORT void ref();
+    WEBCORE_EXPORT void deref();
+
 private:
     JSWindowProxy& createJSWindowProxy(DOMWrapperWorld&);

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -423 +423 @@
 
     if ($type->name eq "WindowProxy") {
+        AddToIncludes("WindowProxy.h", $includesRef, $conditional);
         AddToIncludes("JSWindowProxy.h", $includesRef, $conditional);
         AddToIncludes("JSDOMConvertWindowProxy.h", $includesRef, $conditional);
@@ -6554 +6555 @@
     return 1 if $type->name eq "SerializedScriptValue";
     return 1 if $type->name eq "XPathNSResolver";
+    return 1 if $type->name eq "WindowProxy";
     
     return 0;

trunk/Source/WebCore/dom/Document.cpp

@@ -2594 +2594 @@
 }
 
-ExceptionOr<RefPtr<DOMWindow>> Document::openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features)
+ExceptionOr<RefPtr<WindowProxy>> Document::openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features)
 {
     if (!m_domWindow)

trunk/Source/WebCore/dom/Document.h

@@ -186 +186 @@
 class WebGLRenderingContext;
 class WebGPURenderingContext;
+class WindowProxy;
 class XPathEvaluator;
 class XPathExpression;
@@ -620 +621 @@
     WEBCORE_EXPORT DocumentLoader* loader() const;
 
-    WEBCORE_EXPORT ExceptionOr<RefPtr<DOMWindow>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features);
+    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features);
     WEBCORE_EXPORT ExceptionOr<Document&> openForBindings(Document* responsibleDocument, const String& type, const String& replace);
 

trunk/Source/WebCore/dom/Document.idl

@@ -108 +108 @@
     // the existing 'incumbent document' concept.
     [CEReactions, CallWith=ResponsibleDocument, ImplementedAs=openForBindings, MayThrowException] Document open(optional DOMString type = "text/html", optional DOMString replace = "");
-    [CallWith=ActiveWindow&FirstWindow, ImplementedAs=openForBindings, MayThrowException] DOMWindow open(USVString url, DOMString name, DOMString features);
+    [CallWith=ActiveWindow&FirstWindow, ImplementedAs=openForBindings, MayThrowException] WindowProxy open(USVString url, DOMString name, DOMString features);
     [CEReactions, ImplementedAs=closeForBindings, MayThrowException] void close();
     [CEReactions, CallWith=ResponsibleDocument, MayThrowException] void write(DOMString... text);

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -107 +107 @@
 #include "WindowFeatures.h"
 #include "WindowFocusAllowedIndicator.h"
+#include "WindowProxy.h"
 #include <JavaScriptCore/ScriptCallStack.h>
 #include <JavaScriptCore/ScriptCallStackFactory.h>
@@ -1015 +1016 @@
 void DOMWindow::focus(DOMWindow& incumbentWindow)
 {
-    focus(opener() && opener() != this && &incumbentWindow == opener());
+    auto* opener = this->opener();
+    focus(opener && opener != self() && incumbentWindow.self() == opener);
 }
 
@@ -1418 +1420 @@
 }
 
-DOMWindow* DOMWindow::self() const
-{
-    if (!m_frame)
-        return nullptr;
-
-    return m_frame->document()->domWindow();
-}
-
-DOMWindow* DOMWindow::opener() const
-{
-    if (!m_frame)
-        return nullptr;
-
-    Frame* opener = m_frame->loader().opener();
-    if (!opener)
-        return nullptr;
-
-    return opener->document()->domWindow();
+WindowProxy* DOMWindow::self() const
+{
+    if (!m_frame)
+        return nullptr;
+
+    return &m_frame->windowProxy();
+}
+
+WindowProxy* DOMWindow::opener() const
+{
+    if (!m_frame)
+        return nullptr;
+
+    auto* openerFrame = m_frame->loader().opener();
+    if (!openerFrame)
+        return nullptr;
+
+    return &openerFrame->windowProxy();
 }
 
@@ -1444 +1446 @@
 }
 
-DOMWindow* DOMWindow::parent() const
-{
-    if (!m_frame)
-        return nullptr;
-
-    Frame* parent = m_frame->tree().parent();
-    if (parent)
-        return parent->document()->domWindow();
-
-    return m_frame->document()->domWindow();
-}
-
-DOMWindow* DOMWindow::top() const
-{
-    if (!m_frame)
-        return nullptr;
-
-    Page* page = m_frame->page();
-    if (!page)
-        return nullptr;
-
-    return m_frame->tree().top().document()->domWindow();
+WindowProxy* DOMWindow::parent() const
+{
+    if (!m_frame)
+        return nullptr;
+
+    auto* parentFrame = m_frame->tree().parent();
+    if (parentFrame)
+        return &parentFrame->windowProxy();
+
+    return &m_frame->windowProxy();
+}
+
+WindowProxy* DOMWindow::top() const
+{
+    if (!m_frame)
+        return nullptr;
+
+    if (!m_frame->page())
+        return nullptr;
+
+    return &m_frame->tree().top().windowProxy();
 }
 
@@ -2313 +2314 @@
 }
 
-RefPtr<DOMWindow> DOMWindow::open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString)
+RefPtr<WindowProxy> DOMWindow::open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString)
 {
     if (!isCurrentlyDisplayedInFrame())
@@ -2364 +2365 @@
 
         if (targetFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
-            return targetFrame->document()->domWindow();
+            return &targetFrame->windowProxy();
 
         if (urlString.isEmpty())
-            return targetFrame->document()->domWindow();
+            return &targetFrame->windowProxy();
 
         // For whatever reason, Firefox uses the first window rather than the active window to
@@ -2374 +2375 @@
         targetFrame->navigationScheduler().scheduleLocationChange(*activeDocument, activeDocument->securityOrigin(), completedURL, firstFrame->loader().outgoingReferrer(),
             lockHistory, LockBackForwardList::No);
-        return targetFrame->document()->domWindow();
-    }
-
-    RefPtr<Frame> result = createWindow(urlString, frameName, parseWindowFeatures(windowFeaturesString), activeWindow, *firstFrame, *m_frame);
-    return result ? result->document()->domWindow() : nullptr;
+        return &targetFrame->windowProxy();
+    }
+
+    auto newFrame = createWindow(urlString, frameName, parseWindowFeatures(windowFeaturesString), activeWindow, *firstFrame, *m_frame);
+    return newFrame ? &newFrame->windowProxy() : nullptr;
 }
 

trunk/Source/WebCore/page/DOMWindow.h

@@ -159 +159 @@
     void stop();
 
-    WEBCORE_EXPORT RefPtr<DOMWindow> open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString);
+    WEBCORE_EXPORT RefPtr<WindowProxy> open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString);
 
     void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction);
@@ -194 +194 @@
     void setDefaultStatus(const String&);
 
-    DOMWindow* self() const;
-
-    DOMWindow* opener() const;
+    WindowProxy* self() const;
+
+    WindowProxy* opener() const;
     void disownOpener();
-    DOMWindow* parent() const;
-    DOMWindow* top() const;
+    WindowProxy* parent() const;
+    WindowProxy* top() const;
 
     Frame* frame() const final { return FrameDestructionObserver::frame(); }

trunk/Source/WebCore/page/DOMWindow.idl

@@ -50 +50 @@
 ] interface DOMWindow : EventTarget {
     // The current browsing context.
-    [DoNotCheckSecurity, Unforgeable, ImplementedAs=self] readonly attribute DOMWindow window;
-    [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow self;
+    [DoNotCheckSecurity, Unforgeable, ImplementedAs=self] readonly attribute WindowProxy window;
+    [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute WindowProxy self;
     [Unforgeable] readonly attribute Document document;
     attribute DOMString name;
@@ -71 +71 @@
 
     // Other browsing contexts.
-    [Replaceable, DoNotCheckSecurityOnGetter, ImplementedAs=self] readonly attribute DOMWindow frames;
+    [Replaceable, DoNotCheckSecurityOnGetter, ImplementedAs=self] readonly attribute WindowProxy frames;
     [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute unsigned long length;
-    [DoNotCheckSecurityOnGetter, Unforgeable] readonly attribute DOMWindow? top;
-    [DoNotCheckSecurityOnGetter, CustomSetter] attribute DOMWindow? opener;
-    [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow? parent;
+    [DoNotCheckSecurityOnGetter, Unforgeable] readonly attribute WindowProxy? top;
+    [DoNotCheckSecurityOnGetter, CustomSetter] attribute WindowProxy? opener;
+    [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute WindowProxy? parent;
     [CheckSecurityForNode] readonly attribute Element? frameElement;
-    [CallWith=ActiveWindow&FirstWindow] DOMWindow? open(optional USVString url = "about:blank", optional DOMString target = "_blank", optional [TreatNullAs=EmptyString] DOMString features = "");
+    [CallWith=ActiveWindow&FirstWindow] WindowProxy? open(optional USVString url = "about:blank", optional DOMString target = "_blank", optional [TreatNullAs=EmptyString] DOMString features = "");
 
     // The user agent.

trunk/Source/WebCore/testing/Internals.cpp

@@ -160 +160 @@
 #include "VoidCallback.h"
 #include "WebCoreJSClientData.h"
-#if ENABLE(WEBGL)
-#include "WebGLRenderingContext.h"
-#endif
+#include "WindowProxy.h"
 #include "WorkerThread.h"
 #include "WritingDirection.h"
@@ -204 +202 @@
 #include "HTMLMediaElement.h"
 #include "TimeRanges.h"
+#endif
+
+#if ENABLE(WEBGL)
+#include "WebGLRenderingContext.h"
 #endif
 
@@ -2306 +2308 @@
 }
 
-RefPtr<DOMWindow> Internals::openDummyInspectorFrontend(const String& url)
+RefPtr<WindowProxy> Internals::openDummyInspectorFrontend(const String& url)
 {
     auto* inspectedPage = contextDocument()->frame()->page();
     auto* window = inspectedPage->mainFrame().document()->domWindow();
-    auto frontendWindow = window->open(*window, *window, url, "", "");
-    m_inspectorFrontend = std::make_unique<InspectorStubFrontend>(*inspectedPage, frontendWindow.copyRef());
-    return frontendWindow;
+    auto frontendWindowProxy = window->open(*window, *window, url, "", "");
+    m_inspectorFrontend = std::make_unique<InspectorStubFrontend>(*inspectedPage, downcast<DOMWindow>(frontendWindowProxy->window()));
+    return frontendWindowProxy;
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -350 +350 @@
     unsigned referencingNodeCount(const Document&) const;
 
-    RefPtr<DOMWindow> openDummyInspectorFrontend(const String& url);
+    RefPtr<WindowProxy> openDummyInspectorFrontend(const String& url);
     void closeDummyInspectorFrontend();
     ExceptionOr<void> setInspectorIsUnderTest(bool);

trunk/Source/WebCore/testing/Internals.idl

@@ -316 +316 @@
     unsigned long numberOfLiveDocuments();
     unsigned long referencingNodeCount(Document document);
-    DOMWindow? openDummyInspectorFrontend(DOMString url);
+    WindowProxy? openDummyInspectorFrontend(DOMString url);
     void closeDummyInspectorFrontend();
     [MayThrowException] void setInspectorIsUnderTest(boolean isUnderTest);