Diff
Modified: trunk/Source/WebKit2/ChangeLog (209066 => 209067)
--- trunk/Source/WebKit2/ChangeLog 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-29 14:02:42 UTC (rev 209067)
@@ -1,3 +1,31 @@
+2016-11-21 Brian Burg <[email protected]>
+
+ Web Automation: add ObjC SPI to set whether a page is controlled by automation
+ https://bugs.webkit.org/show_bug.cgi?id=165001
+ <rdar://problem/29350432>
+
+ Reviewed by Dan Bernstein.
+
+ Add SPI property to WKWebViewConfiguration and plumb it through to
+ initialize WebPageProxy::m_controlledByAutomation. This is propagated
+ to the WebProcess on creation via WebPageCreationParameters.
+
+ * UIProcess/API/APIPageConfiguration.cpp:
+ (API::PageConfiguration::copy):
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::isControlledByAutomation):
+ (API::PageConfiguration::setControlledByAutomation):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _isControlledByAutomation]):
+ (-[WKWebViewConfiguration _setControlledByAutomation:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+
2016-11-28 Carlos Garcia Campos <[email protected]>
[GTK] BadDamage X Window System error in WebKit::AcceleratedBackingStoreX11::update when called from WebPageProxy::exitAcceleratedCompositingMode
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2016-11-29 14:02:42 UTC (rev 209067)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -68,6 +68,7 @@
copy->m_alwaysRunsAtForegroundPriority = this->m_alwaysRunsAtForegroundPriority;
#endif
copy->m_initialCapitalizationEnabled = this->m_initialCapitalizationEnabled;
+ copy->m_controlledByAutomation = this->m_controlledByAutomation;
return copy;
}
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-11-29 14:02:42 UTC (rev 209067)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -95,6 +95,9 @@
bool waitsForPaintAfterViewDidMoveToWindow() const { return m_waitsForPaintAfterViewDidMoveToWindow; }
void setWaitsForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
+ bool isControlledByAutomation() const { return m_controlledByAutomation; }
+ void setControlledByAutomation(bool controlledByAutomation) { m_controlledByAutomation = controlledByAutomation; }
+
private:
RefPtr<WebKit::WebProcessPool> m_processPool;
@@ -116,6 +119,7 @@
#endif
bool m_initialCapitalizationEnabled = true;
bool m_waitsForPaintAfterViewDidMoveToWindow = true;
+ bool m_controlledByAutomation = false;
};
} // namespace API
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-29 14:02:42 UTC (rev 209067)
@@ -450,6 +450,7 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
pageConfiguration->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
+ pageConfiguration->setControlledByAutomation([_configuration _isControlledByAutomation]);
#if PLATFORM(MAC)
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::showsURLsInToolTipsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _showsURLsInToolTips]));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-11-29 14:02:42 UTC (rev 209067)
@@ -124,6 +124,7 @@
#endif
BOOL _initialCapitalizationEnabled;
BOOL _waitsForPaintAfterViewDidMoveToWindow;
+ BOOL _controlledByAutomation;
#if ENABLE(APPLE_PAY)
BOOL _applePayEnabled;
@@ -289,6 +290,7 @@
configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
+ configuration->_controlledByAutomation = self->_controlledByAutomation;
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
@@ -671,6 +673,16 @@
_waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
}
+- (BOOL)_isControlledByAutomation
+{
+ return _controlledByAutomation;
+}
+
+- (void)_setControlledByAutomation:(BOOL)controlledByAutomation
+{
+ _controlledByAutomation = controlledByAutomation;
+}
+
#if PLATFORM(MAC)
- (BOOL)_showsURLsInToolTips
{
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-11-29 14:02:42 UTC (rev 209067)
@@ -57,6 +57,7 @@
@property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setControlledByAutomation:, getter=_isControlledByAutomation) BOOL _controlledByAutomation WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
#if TARGET_OS_IPHONE
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (209066 => 209067)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-29 12:57:34 UTC (rev 209066)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-29 14:02:42 UTC (rev 209067)
@@ -405,6 +405,7 @@
, m_sessionID(m_configuration->sessionID())
, m_isPageSuspended(false)
, m_addsVisitedLinks(true)
+ , m_controlledByAutomation(m_configuration->isControlledByAutomation())
#if ENABLE(REMOTE_INSPECTOR)
, m_allowsRemoteInspection(true)
#endif