Changeset 211036 in webkit

Timestamp:

Jan 23, 2017 1:54:59 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Remove allowWindowOpenWithoutUserGesture setting
​https://bugs.webkit.org/show_bug.cgi?id=167301

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-01-23
Reviewed by Darin Adler.

Source/WebCore:

• page/DOMWindow.cpp:

(WebCore::DOMWindow::allowPopUp):

• page/Settings.in:

Source/WebKit/mac:

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):
Use the equivalent existing setting.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebCore/page/Settings.in (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-23  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Remove allowWindowOpenWithoutUserGesture setting
+        https://bugs.webkit.org/show_bug.cgi?id=167301
+
+        Reviewed by Darin Adler.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::allowPopUp):
+        * page/Settings.in:
+
 2017-01-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -364 +364 @@
 bool DOMWindow::allowPopUp(Frame& firstFrame)
 {
-    auto& settings = firstFrame.settings();
     return ScriptController::processingUserGesture()
-        || settings.allowWindowOpenWithoutUserGesture()
-        || settings.javaScriptCanOpenWindowsAutomatically();
+        || firstFrame.settings().javaScriptCanOpenWindowsAutomatically();
 }
 

trunk/Source/WebCore/page/Settings.in

@@ -266 +266 @@
 allowContentSecurityPolicySourceStarToMatchAnyProtocol initial=false
 
-allowWindowOpenWithoutUserGesture initial=false
-
 selectionPaintingWithoutSelectionGapsEnabled initial=false
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2017-01-23  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Remove allowWindowOpenWithoutUserGesture setting
+        https://bugs.webkit.org/show_bug.cgi?id=167301
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+        Use the equivalent existing setting.
+
 2017-01-20  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2639 +2639 @@
     settings.setAllowFileAccessFromFileURLs([preferences allowFileAccessFromFileURLs]);
     settings.setNeedsStorageAccessFromFileURLsQuirk([preferences needsStorageAccessFromFileURLsQuirk]);
-    settings.setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically]);
     settings.setMinimumFontSize([preferences minimumFontSize]);
     settings.setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
@@ -2733 +2732 @@
     settings.setAllowRunningOfInsecureContent(shouldAllowDisplayAndRunningOfInsecureContent());
 
+    settings.setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically] || shouldAllowWindowOpenWithoutUserGesture());
+
     settings.setVisualViewportEnabled([preferences visualViewportEnabled]);
 
@@ -2927 +2928 @@
 
     settings.setAllowContentSecurityPolicySourceStarToMatchAnyProtocol(shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol());
-
-    settings.setAllowWindowOpenWithoutUserGesture(shouldAllowWindowOpenWithoutUserGesture());
 
     settings.setShouldConvertInvalidURLsToBlank(shouldConvertInvalidURLsToBlank());