Changeset 273817 in webkit

Timestamp:

Mar 3, 2021, 8:55:05 AM (6 years ago)

Author:

youenn@apple.com

Message:

WebKitLegacy needs to keep JSDOMWindow even though it is used while its origin is not set
​https://bugs.webkit.org/show_bug.cgi?id=222589
<rdar://problem/74258258>

Reviewed by Geoffrey Garen.

Source/WebCore:

Use the new flag to allow reuse of JSDOMWindow objects even though they are created at a time where its SecurityOrigin is not set yet.
This allows keeping WebKitLegacy existing functionality.

Covered by API test.

• bindings/js/JSWindowProxy.cpp:

(WebCore::JSWindowProxy::setWindow):

Source/WTF:

• Scripts/Preferences/WebPreferencesInternal.yaml:

Introduce a flag, on for WebKit and off for WebKitLegacy.

Tools:

• TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSWindowProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-03-03  Youenn Fablet  <youenn@apple.com>
+
+        WebKitLegacy needs to keep JSDOMWindow even though it is used while its origin is not set
+        https://bugs.webkit.org/show_bug.cgi?id=222589
+        <rdar://problem/74258258>
+
+        Reviewed by Geoffrey Garen.
+
+        * Scripts/Preferences/WebPreferencesInternal.yaml:
+        Introduce a flag, on for WebKit and off for WebKitLegacy.
+
 2021-03-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml

@@ -886 +886 @@
       default: true
 
+WindowObjectAlwaysInitializedWithSecurityOriginEnabled:
+  type: bool
+  humanReadableName: "Ensure Window object is initialized with a security origin"
+  humanReadableDescription: "Ensure Window object is initialized with a security origin"
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+    WebCore:
+      default: true
+
 ZoomOnDoubleTapWhenRoot:
   type: bool

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-03  Youenn Fablet  <youenn@apple.com>
+
+        WebKitLegacy needs to keep JSDOMWindow even though it is used while its origin is not set
+        https://bugs.webkit.org/show_bug.cgi?id=222589
+        <rdar://problem/74258258>
+
+        Reviewed by Geoffrey Garen.
+
+        Use the new flag to allow reuse of JSDOMWindow objects even though they are created at a time where its SecurityOrigin is not set yet.
+        This allows keeping WebKitLegacy existing functionality.
+
+        Covered by API test.
+
+        * bindings/js/JSWindowProxy.cpp:
+        (WebCore::JSWindowProxy::setWindow):
+
 2021-03-03  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -107 +107 @@
         auto& windowStructure = *JSDOMWindow::createStructure(vm, nullptr, prototype);
         window = JSDOMWindow::create(vm, &windowStructure, localWindow, this);
-        if (!localWindow.document()->haveInitializedSecurityOrigin())
+        if (!localWindow.document()->haveInitializedSecurityOrigin() && localWindow.document()->settings().windowObjectAlwaysInitializedWithSecurityOriginEnabled())
             localWindow.setAsWrappedWithoutInitializedSecurityOrigin();
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-03-03  Youenn Fablet  <youenn@apple.com>
+
+        WebKitLegacy needs to keep JSDOMWindow even though it is used while its origin is not set
+        https://bugs.webkit.org/show_bug.cgi?id=222589
+        <rdar://problem/74258258>
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm:
+        (TestWebKitAPI::TEST):
+
 2021-03-03  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm

@@ -27 +27 @@
 #import "PlatformUtilities.h"
 #import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebScriptWorld.h>
 #import <JavaScriptCore/JSContextRef.h>
@@ -96 +97 @@
 }
 
+TEST(WebKitLegacy, JSDOMWindowWrapperBeforeOriginInitialization)
+{
+    auto webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
+    auto frameLoadDelegate = adoptNS([[JSWrapperForNodeFrameLoadDelegate alloc] init]);
+
+    webView.get().frameLoadDelegate = frameLoadDelegate.get();
+    auto *mainFrame = webView.get().mainFrame;
+    [mainFrame loadHTMLString:@"<div id=\"target\"</div>" baseURL:[NSURL URLWithString:@"http://localhost"]];
+
+    auto *normalWorld = [WebScriptWorld standardWorld];
+    auto normalCtx = [mainFrame _globalContextForScriptWorld:normalWorld];
+
+    [mainFrame _stringByEvaluatingJavaScriptFromString:@"window.caches = 1" withGlobalObject:JSContextGetGlobalObject(normalCtx) inScriptWorld:normalWorld];
+
+    auto result = [mainFrame _stringByEvaluatingJavaScriptFromString:@"window.caches" withGlobalObject:JSContextGetGlobalObject(normalCtx) inScriptWorld:normalWorld];
+    EXPECT_WK_STREQ(result, @"1");
+
+    Util::run(&didFinishLoad);
+
+    result = [mainFrame _stringByEvaluatingJavaScriptFromString:@"window.caches" withGlobalObject:JSContextGetGlobalObject(normalCtx) inScriptWorld:normalWorld];
+    EXPECT_WK_STREQ(result, @"1");
+}
+
 } // namespace TestWebKitAPI