REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
https://bugs.webkit.org/show_bug.cgi?id=202940
<rdar://problem/56262298>
Reviewed by Ryosuke Niwa.
Source/WebKitLegacy/win:
Add support for the asyncClipboardAPIEnabled feature flag in legacy WebKit on Windows.
* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::asyncClipboardAPIEnabled):
(WebPreferences::setAsyncClipboardAPIEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):
Tools:
Add some plumbing to support the async clipboard API experimental test option in Windows.
* DumpRenderTree/win/DumpRenderTree.cpp:
(setWebPreferencesForTestOptions):
LayoutTests:
* editing/async-clipboard/clipboard-interfaces.html:
* editing/async-clipboard/clipboard-item-basic.html:
* editing/async-clipboard/clipboard-wrapper-stays-alive.html:
Tweak a few layout tests to actually turn the experimental feature on (this previously worked because
experimental feature flags are already on by default in WebKit2).
* platform/ios-wk1/TestExpectations:
* platform/mac-wk1/TestExpectations:
* platform/win/TestExpectations:
Unskip and unmark these layout tests as failing in WebKit1 on iOS, macOS, and Windows.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251149 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d99cc8c..0eb924f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2019-10-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=202940
+ <rdar://problem/56262298>
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/async-clipboard/clipboard-interfaces.html:
+ * editing/async-clipboard/clipboard-item-basic.html:
+ * editing/async-clipboard/clipboard-wrapper-stays-alive.html:
+
+ Tweak a few layout tests to actually turn the experimental feature on (this previously worked because
+ experimental feature flags are already on by default in WebKit2).
+
+ * platform/ios-wk1/TestExpectations:
+ * platform/mac-wk1/TestExpectations:
+ * platform/win/TestExpectations:
+
+ Unskip and unmark these layout tests as failing in WebKit1 on iOS, macOS, and Windows.
+
2019-10-15 Dean Jackson <dino@apple.com>
Reset maxCanvasPixelMemory between tests
diff --git a/LayoutTests/editing/async-clipboard/clipboard-interfaces.html b/LayoutTests/editing/async-clipboard/clipboard-interfaces.html
index 75a2676..f5c3c84 100644
--- a/LayoutTests/editing/async-clipboard/clipboard-interfaces.html
+++ b/LayoutTests/editing/async-clipboard/clipboard-interfaces.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ experimental:asyncClipboardAPIEnabled=true ] -->
+<!DOCTYPE html> <!-- webkit-test-runner [ experimental:AsyncClipboardAPIEnabled=true ] -->
<html>
<head>
<script src="../../resources/js-test.js"></script>
diff --git a/LayoutTests/editing/async-clipboard/clipboard-item-basic.html b/LayoutTests/editing/async-clipboard/clipboard-item-basic.html
index fdebdb3..1a3b62d 100644
--- a/LayoutTests/editing/async-clipboard/clipboard-item-basic.html
+++ b/LayoutTests/editing/async-clipboard/clipboard-item-basic.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ experimental:asyncClipboardAPIEnabled=true ] -->
+<!DOCTYPE html> <!-- webkit-test-runner [ experimental:AsyncClipboardAPIEnabled=true ] -->
<html>
<meta charset="utf8">
<head>
diff --git a/LayoutTests/editing/async-clipboard/clipboard-wrapper-stays-alive.html b/LayoutTests/editing/async-clipboard/clipboard-wrapper-stays-alive.html
index c1f5618..170cdf9 100644
--- a/LayoutTests/editing/async-clipboard/clipboard-wrapper-stays-alive.html
+++ b/LayoutTests/editing/async-clipboard/clipboard-wrapper-stays-alive.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ experimental:asyncClipboardAPIEnabled=true ] -->
+<!DOCTYPE html> <!-- webkit-test-runner [ experimental:AsyncClipboardAPIEnabled=true ] -->
<html>
<head>
<script src="../../resources/js-test.js"></script>
diff --git a/LayoutTests/platform/ios-wk1/TestExpectations b/LayoutTests/platform/ios-wk1/TestExpectations
index 8a56f87..3cbeffb 100644
--- a/LayoutTests/platform/ios-wk1/TestExpectations
+++ b/LayoutTests/platform/ios-wk1/TestExpectations
@@ -16,9 +16,6 @@
imported/w3c/web-platform-tests/fetch/api/request/destination [ Skip ]
imported/w3c/web-platform-tests/fetch/cross-origin-resource-policy [ Skip ]
-# Async Clipboard API is not supported in WebKit1 yet.
-webkit.org/b/202654 editing/async-clipboard [ Skip ]
-
# Skip WebRTC for now in WK1
imported/w3c/web-platform-tests/webrtc [ Skip ]
webrtc [ Skip ]
diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index ba1aa40..8678d6d 100644
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -44,9 +44,6 @@
css-typedom [ Skip ]
css-dark-mode [ Skip ]
-# Async Clipboard API is not supported in WebKit1 yet.
-webkit.org/b/202654 editing/async-clipboard [ Skip ]
-
webgpu [ Skip ]
inspector/canvas/create-context-webgpu.html [ Skip ]
inspector/canvas/requestClientNodes-webgpu.html [ Skip ]
diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
index ec2cf5c..4b58a8f 100644
--- a/LayoutTests/platform/win/TestExpectations
+++ b/LayoutTests/platform/win/TestExpectations
@@ -4470,9 +4470,6 @@
webkit.org/b/202939 fast/workers/worker-exception-during-navigation.html [ Failure Pass ]
-webkit.org/b/202940 editing/async-clipboard/clipboard-interfaces.html [ Failure ]
-webkit.org/b/202940 editing/async-clipboard/clipboard-item-basic.html [ Failure ]
-
webkit.org/b/202945 fast/css/invalidation-errors-2.html [ Failure ]
webkit.org/b/202945 fast/css/invalidation-errors.html [ Failure ]
@@ -4488,8 +4485,6 @@
webkit.org/b/202954 http/wpt/resource-timing/rt-resources-per-worker.html [ Failure ]
-webkit.org/b/202950 editing/async-clipboard/clipboard-wrapper-stays-alive.html [ Timeout ]
-
webkit.org/b/202951 fast/canvas/drawImage-animated-gif-draws-first-frame-and-no-reset-image.html [ Timeout ]
webkit.org/b/202952 http/tests/security/navigate-when-restoring-cached-page.html [ Timeout ]
diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
index 2358eef..7ace802 100644
--- a/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
+++ b/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
@@ -273,5 +273,6 @@
#define WebKitResizeObserverEnabledPreferenceKey @"WebKitResizeObserverEnabled"
#define WebKitCoreMathMLEnabledPreferenceKey @"WebKitCoreMathMLEnabled"
#define WebKitRequestIdleCallbackEnabledPreferenceKey @"WebKitRequestIdleCallbackEnabled"
+#define WebKitAsyncClipboardAPIEnabledPreferenceKey @"WebKitAsyncClipboardAPIEnabled"
#define WebKitLinkPreloadResponsiveImagesEnabledPreferenceKey @"WebKitLinkPreloadResponsiveImagesEnabled"
diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
index 940de36..1104f5a 100644
--- a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
@@ -691,6 +691,7 @@
#endif
@NO, WebKitCoreMathMLEnabledPreferenceKey,
@NO, WebKitRequestIdleCallbackEnabledPreferenceKey,
+ @NO, WebKitAsyncClipboardAPIEnabledPreferenceKey,
@NO, WebKitLinkPreloadResponsiveImagesEnabledPreferenceKey,
@YES, WebKitCSSShadowPartsEnabledPreferenceKey,
nil];
@@ -3509,6 +3510,16 @@
[self _setBoolValue:flag forKey:WebKitRequestIdleCallbackEnabledPreferenceKey];
}
+- (BOOL)asyncClipboardAPIEnabled
+{
+ return [self _boolValueForKey:WebKitAsyncClipboardAPIEnabledPreferenceKey];
+}
+
+- (void)setAsyncClipboardAPIEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitAsyncClipboardAPIEnabledPreferenceKey];
+}
+
- (BOOL)linkPreloadResponsiveImagesEnabled
{
return [self _boolValueForKey:WebKitLinkPreloadResponsiveImagesEnabledPreferenceKey];
diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
index 41d5591..da5d04e 100644
--- a/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
+++ b/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
@@ -615,6 +615,9 @@
- (void)setRequestIdleCallbackEnabled:(BOOL)flag;
- (BOOL)requestIdleCallbackEnabled;
+- (void)setAsyncClipboardAPIEnabled:(BOOL)flag;
+- (BOOL)asyncClipboardAPIEnabled;
+
- (void)setLinkPreloadResponsiveImagesEnabled:(BOOL)flag;
- (BOOL)linkPreloadResponsiveImagesEnabled;
@@ -656,6 +659,7 @@
@property (nonatomic) BOOL resizeObserverEnabled;
@property (nonatomic) BOOL coreMathMLEnabled;
@property (nonatomic) BOOL requestIdleCallbackEnabled;
+@property (nonatomic) BOOL asyncClipboardAPIEnabled;
@property (nonatomic) BOOL linkPreloadResponsiveImagesEnabled;
#if TARGET_OS_IPHONE
diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
index 61dbc93..ee67b5b 100644
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -3236,6 +3236,7 @@
settings.setCoreMathMLEnabled([preferences coreMathMLEnabled]);
settings.setRequestIdleCallbackEnabled([preferences requestIdleCallbackEnabled]);
+ settings.setAsyncClipboardAPIEnabled(preferences.asyncClipboardAPIEnabled);
RuntimeEnabledFeatures::sharedFeatures().setServerTimingEnabled([preferences serverTimingEnabled]);
diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
index fff92a0..3497e48 100644
--- a/Source/WebKitLegacy/win/ChangeLog
+++ b/Source/WebKitLegacy/win/ChangeLog
@@ -1,3 +1,23 @@
+2019-10-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=202940
+ <rdar://problem/56262298>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add support for the asyncClipboardAPIEnabled feature flag in legacy WebKit on Windows.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::asyncClipboardAPIEnabled):
+ (WebPreferences::setAsyncClipboardAPIEnabled):
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2019-10-14 Chris Dumez <cdumez@apple.com>
[WK2] Have WebBackForwardCache class coordinate page caching in all WebProcesses
diff --git a/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl b/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl
index fffde8a..1f07581 100644
--- a/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl
+++ b/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl
@@ -246,4 +246,6 @@
HRESULT setCoreMathMLEnabled([in] BOOL enabled);
HRESULT requestIdleCallbackEnabled([out, retval] BOOL* enabled);
HRESULT setRequestIdleCallbackEnabled([in] BOOL enabled);
+ HRESULT asyncClipboardAPIEnabled([out, retval] BOOL* enabled);
+ HRESULT setAsyncClipboardAPIEnabled([in] BOOL enabled);
}
diff --git a/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h b/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h
index ad8b95a..447fd9f 100644
--- a/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h
+++ b/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h
@@ -213,3 +213,5 @@
#define WebKitCoreMathMLEnabledPreferenceKey "WebKitCoreMathMLEnabled"
#define WebKitRequestIdleCallbackEnabledPreferenceKey "WebKitRequestIdleCallbackEnabled"
+
+#define WebKitAsyncClipboardAPIEnabledPreferenceKey "WebKitAsyncClipboardAPIEnabled"
diff --git a/Source/WebKitLegacy/win/WebPreferences.cpp b/Source/WebKitLegacy/win/WebPreferences.cpp
index 3be14de..9a78426 100644
--- a/Source/WebKitLegacy/win/WebPreferences.cpp
+++ b/Source/WebKitLegacy/win/WebPreferences.cpp
@@ -341,6 +341,8 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitRequestIdleCallbackEnabledPreferenceKey), kCFBooleanFalse);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitAsyncClipboardAPIEnabledPreferenceKey), kCFBooleanFalse);
+
defaultSettings = defaults;
#endif
}
@@ -2293,6 +2295,20 @@
return S_OK;
}
+HRESULT WebPreferences::asyncClipboardAPIEnabled(_Out_ BOOL* enabled)
+{
+ if (!enabled)
+ return E_POINTER;
+ *enabled = boolValueForKey(WebKitAsyncClipboardAPIEnabledPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setAsyncClipboardAPIEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitAsyncClipboardAPIEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
HRESULT WebPreferences::setApplicationId(BSTR applicationId)
{
#if USE(CF)
diff --git a/Source/WebKitLegacy/win/WebPreferences.h b/Source/WebKitLegacy/win/WebPreferences.h
index fec573f..22bb1b3 100644
--- a/Source/WebKitLegacy/win/WebPreferences.h
+++ b/Source/WebKitLegacy/win/WebPreferences.h
@@ -291,6 +291,8 @@
virtual HRESULT STDMETHODCALLTYPE setCoreMathMLEnabled(BOOL);
virtual HRESULT STDMETHODCALLTYPE requestIdleCallbackEnabled(_Out_ BOOL*);
virtual HRESULT STDMETHODCALLTYPE setRequestIdleCallbackEnabled(BOOL);
+ virtual HRESULT STDMETHODCALLTYPE asyncClipboardAPIEnabled(_Out_ BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setAsyncClipboardAPIEnabled(BOOL);
// WebPreferences
diff --git a/Source/WebKitLegacy/win/WebView.cpp b/Source/WebKitLegacy/win/WebView.cpp
index f7b5c86..790c1a1 100644
--- a/Source/WebKitLegacy/win/WebView.cpp
+++ b/Source/WebKitLegacy/win/WebView.cpp
@@ -5614,6 +5614,11 @@
return hr;
settings.setRequestIdleCallbackEnabled(!!enabled);
+ hr = prefsPrivate->asyncClipboardAPIEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setAsyncClipboardAPIEnabled(!!enabled);
+
return S_OK;
}
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c7c72e4..348fede 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=202940
+ <rdar://problem/56262298>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add some plumbing to support the async clipboard API experimental test option in Windows.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (setWebPreferencesForTestOptions):
+
2019-10-15 Jiewen Tan <jiewen_tan@apple.com>
[WebAuthn] Write more tests for _WKWebAuthenticationPanel
diff --git a/Tools/DumpRenderTree/TestOptions.cpp b/Tools/DumpRenderTree/TestOptions.cpp
index 6282d72..1ff849e 100644
--- a/Tools/DumpRenderTree/TestOptions.cpp
+++ b/Tools/DumpRenderTree/TestOptions.cpp
@@ -125,6 +125,8 @@
enableCoreMathML = parseBooleanTestHeaderValue(value);
else if (key == "experimental:RequestIdleCallbackEnabled")
enableRequestIdleCallback = parseBooleanTestHeaderValue(value);
+ else if (key == "experimental:AsyncClipboardAPIEnabled")
+ enableAsyncClipboardAPI = parseBooleanTestHeaderValue(value);
pairStart = pairEnd + 1;
}
}
diff --git a/Tools/DumpRenderTree/TestOptions.h b/Tools/DumpRenderTree/TestOptions.h
index 37a3b4b..0969b18 100644
--- a/Tools/DumpRenderTree/TestOptions.h
+++ b/Tools/DumpRenderTree/TestOptions.h
@@ -52,6 +52,7 @@
bool enableResizeObserver { false };
bool enableCoreMathML { false };
bool enableRequestIdleCallback { false };
+ bool enableAsyncClipboardAPI { false };
std::string jscOptions;
std::string additionalSupportedImageTypes;
diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index 84d3bc7..14f820f 100644
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -1029,6 +1029,7 @@
preferences.resizeObserverEnabled = options.enableResizeObserver;
preferences.coreMathMLEnabled = options.enableCoreMathML;
preferences.requestIdleCallbackEnabled = options.enableRequestIdleCallback;
+ preferences.asyncClipboardAPIEnabled = options.enableAsyncClipboardAPI;
preferences.privateBrowsingEnabled = options.useEphemeralSession;
preferences.usesPageCache = options.enablePageCache;
}
diff --git a/Tools/DumpRenderTree/win/DumpRenderTree.cpp b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
index 99773d3..a2deb81 100644
--- a/Tools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -912,6 +912,7 @@
prefsPrivate->setIsSecureContextAttributeEnabled(options.enableIsSecureContextAttribute);
prefsPrivate->setInspectorAdditionsEnabled(options.enableInspectorAdditions);
prefsPrivate->setRequestIdleCallbackEnabled(options.enableRequestIdleCallback);
+ prefsPrivate->setAsyncClipboardAPIEnabled(options.enableAsyncClipboardAPI);
preferences->setPrivateBrowsingEnabled(options.useEphemeralSession);
preferences->setUsesPageCache(options.enablePageCache);
}
