Diff
Modified: trunk/Tools/ChangeLog (216202 => 216203)
--- trunk/Tools/ChangeLog 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/ChangeLog 2017-05-04 20:08:40 UTC (rev 216203)
@@ -1,3 +1,37 @@
+2017-05-04 Andy Estes <[email protected]>
+
+ Give +testwebkitapi_configurationWithTestPlugInClassName: a shorter name
+ https://bugs.webkit.org/show_bug.cgi?id=171673
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLs.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegate.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/BundleParameters.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandle.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:
+ (configurationWithContentFilterSettings):
+ (-[LazilyLoadPlatformFrameworksController init]):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptions.mm:
+ (runTestWithWidth):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorld.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/WKWebViewConfigurationExtras.h:
+ * TestWebKitAPI/WKWebViewConfigurationExtras.mm:
+ (+[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:]):
+ (+[WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:]): Renamed to
+ +_test_configurationWithTestPlugInClassName:
+
2017-05-04 Eric Carlson <[email protected]>
[MediaStream] Allow host application to enable/disable media capture
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLs.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLs.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AdditionalReadAccessAllowedURLs.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -43,7 +43,7 @@
TEST(WebKit2, AdditionalReadAccessAllowedURLs)
{
- RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"AdditionalReadAccessAllowedURLsPlugIn"]);
+ RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"AdditionalReadAccessAllowedURLsPlugIn"]);
_WKProcessPoolConfiguration *processPoolConfiguration = [configuration processPool]._configuration;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegate.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegate.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleEditingDelegate.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -73,7 +73,7 @@
TEST(WebKit2, WKWebProcessPlugInEditingDelegate)
{
- RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"]);
+ RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"]);
[[configuration processPool] _setObject:[NSNumber numberWithBool:NO] forBundleParameter:@"EditingDelegateShouldInsertText"];
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleParameters.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleParameters.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleParameters.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -39,7 +39,7 @@
{
@autoreleasepool {
NSString * const testPlugInClassName = @"BundleParametersPlugIn";
- auto configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:testPlugInClassName]);
+ auto configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:testPlugInClassName]);
auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
[webView evaluateJavaScript:TestWebKitAPI::Util::TestPlugInClassNameParameter completionHandler:^(id result, NSError *error) {
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandle.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandle.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/BundleRangeHandle.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -64,7 +64,7 @@
// FIXME: Re-enable this test once webkit.org/b/167594 is fixed.
TEST(WebKit2, DISABLED_WKWebProcessPlugInRangeHandle)
{
- RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"BundleRangeHandlePlugIn"]);
+ RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleRangeHandlePlugIn"]);
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
RetainPtr<BundleRangeHandleRemoteObject> object = adoptNS([[BundleRangeHandleRemoteObject alloc] init]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -49,7 +49,7 @@
{
NSString * const testPlugInClassName = @"CancelFontSubresourcePlugIn";
- RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:testPlugInClassName]);
+ RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:testPlugInClassName]);
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -91,7 +91,7 @@
static RetainPtr<WKWebViewConfiguration> configurationWithContentFilterSettings(Decision decision, DecisionPoint decisionPoint)
{
- auto configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"ContentFilteringPlugIn"]);
+ auto configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"ContentFilteringPlugIn"]);
auto contentFilterEnabler = adoptNS([[MockContentFilterEnabler alloc] initWithDecision:decision decisionPoint:decisionPoint]);
[[configuration processPool] _setObject:contentFilterEnabler.get() forBundleParameter:NSStringFromClass([MockContentFilterEnabler class])];
return configuration;
@@ -340,7 +340,7 @@
if (!(self = [super init]))
return nil;
- WKWebViewConfiguration *configuration = [WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"ContentFilteringPlugIn"];
+ WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"ContentFilteringPlugIn"];
_webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration]);
[_webView setNavigationDelegate:self];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RemoteObjectRegistry.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -44,7 +44,7 @@
{
@autoreleasepool {
NSString * const testPlugInClassName = @"RemoteObjectRegistryPlugIn";
- auto configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:testPlugInClassName]);
+ auto configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:testPlugInClassName]);
auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
isDone = false;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptions.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptions.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RenderedImageWithOptions.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -41,7 +41,7 @@
static void runTestWithWidth(NSNumber *width, CGSize expectedSize)
{
- WKWebViewConfiguration *configuration = [WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"RenderedImageWithOptionsPlugIn"];
+ WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"RenderedImageWithOptionsPlugIn"];
auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration]);
_WKRemoteObjectInterface *interface = [_WKRemoteObjectInterface remoteObjectInterfaceWithProtocol:@protocol(RenderedImageWithOptionsProtocol)];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorld.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorld.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentWorld.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -137,7 +137,7 @@
{
NSString * const testPlugInClassName = @"UserContentWorldPlugIn";
- RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:testPlugInClassName]);
+ RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:testPlugInClassName]);
RetainPtr<_WKUserContentWorld> isolatedWorld = [_WKUserContentWorld worldWithName:@"TestWorld"];
RetainPtr<WKUserScript> userScript = adoptNS([[WKUserScript alloc] _initWithSource:@"window.setFromUserScript = true;" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:isolatedWorld.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -543,7 +543,7 @@
TEST(DataInteractionTests, AttachmentElementItemProviders)
{
- RetainPtr<WKWebViewConfiguration> configuration = [WKWebViewConfiguration testwebkitapi_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"];
+ RetainPtr<WKWebViewConfiguration> configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"];
[configuration _setAttachmentElementEnabled:YES];
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get()]);
[webView synchronouslyLoadTestPageNamed:@"attachment-element"];
Modified: trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.h (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.h 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.h 2017-05-04 20:08:40 UTC (rev 216203)
@@ -28,7 +28,7 @@
#if WK_API_ENABLED
@interface WKWebViewConfiguration (TestWebKitAPIExtras)
-+ (instancetype)testwebkitapi_configurationWithTestPlugInClassName:(NSString *)className;
++ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className;
@end
#endif // WK_API_ENABLED
Modified: trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.mm (216202 => 216203)
--- trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.mm 2017-05-04 20:02:42 UTC (rev 216202)
+++ trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.mm 2017-05-04 20:08:40 UTC (rev 216203)
@@ -35,7 +35,7 @@
@implementation WKWebViewConfiguration (TestWebKitAPIExtras)
-+ (instancetype)testwebkitapi_configurationWithTestPlugInClassName:(NSString *)className
++ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className
{
auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
[processPoolConfiguration setInjectedBundleURL:[[NSBundle mainBundle] URLForResource:@"TestWebKitAPI" withExtension:@"wkbundle"]];
