- Revision
- 207298
- Author
- timothy_hor...@apple.com
- Date
- 2016-10-13 12:01:53 -0700 (Thu, 13 Oct 2016)
Log Message
Rename the SPI added in r207292 due to post-landing review comments
https://bugs.webkit.org/show_bug.cgi?id=163364
<rdar://problem/28012494>
Reviewed by Simon Fraser.
* UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::waitsForPaintAfterViewDidMoveToWindow):
(API::PageConfiguration::setWaitsForPaintAfterViewDidMoveToWindow):
(API::PageConfiguration::shouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
(API::PageConfiguration::setShouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
(-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
(-[WKWebViewConfiguration _shouldWaitForPaintAfterViewDidMoveToWindow]): Deleted.
(-[WKWebViewConfiguration _setShouldWaitForPaintAfterViewDidMoveToWindow:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::dispatchViewStateChange):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207297 => 207298)
--- trunk/Source/WebKit2/ChangeLog 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-13 19:01:53 UTC (rev 207298)
@@ -1,3 +1,31 @@
+2016-10-13 Tim Horton <timothy_hor...@apple.com>
+
+ Rename the SPI added in r207292 due to post-landing review comments
+ https://bugs.webkit.org/show_bug.cgi?id=163364
+ <rdar://problem/28012494>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::waitsForPaintAfterViewDidMoveToWindow):
+ (API::PageConfiguration::setWaitsForPaintAfterViewDidMoveToWindow):
+ (API::PageConfiguration::shouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
+ (API::PageConfiguration::setShouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
+ (-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
+ (-[WKWebViewConfiguration _shouldWaitForPaintAfterViewDidMoveToWindow]): Deleted.
+ (-[WKWebViewConfiguration _setShouldWaitForPaintAfterViewDidMoveToWindow:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ * UIProcess/WebPageProxy.h:
+
2016-10-13 Jonathan Bedard <jbed...@apple.com>
GTK and EFL on Mac fail to compile WebTextChecker due to missing definition of WKTextCheckerClientBase
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-10-13 19:01:53 UTC (rev 207298)
@@ -92,8 +92,8 @@
bool initialCapitalizationEnabled() { return m_initialCapitalizationEnabled; }
void setInitialCapitalizationEnabled(bool initialCapitalizationEnabled) { m_initialCapitalizationEnabled = initialCapitalizationEnabled; }
- bool shouldWaitForPaintAfterViewDidMoveToWindow() const { return m_shouldWaitForPaintAfterViewDidMoveToWindow; }
- void setShouldWaitForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
+ bool waitsForPaintAfterViewDidMoveToWindow() const { return m_waitsForPaintAfterViewDidMoveToWindow; }
+ void setWaitsForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
private:
@@ -115,7 +115,7 @@
bool m_alwaysRunsAtForegroundPriority = false;
#endif
bool m_initialCapitalizationEnabled = true;
- bool m_shouldWaitForPaintAfterViewDidMoveToWindow = true;
+ bool m_waitsForPaintAfterViewDidMoveToWindow = true;
};
} // namespace API
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-13 19:01:53 UTC (rev 207298)
@@ -438,7 +438,7 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
pageConfiguration->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
- pageConfiguration->setShouldWaitForPaintAfterViewDidMoveToWindow([_configuration _shouldWaitForPaintAfterViewDidMoveToWindow]);
+ pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
#if PLATFORM(MAC)
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::showsURLsInToolTipsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _showsURLsInToolTips]));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-10-13 19:01:53 UTC (rev 207298)
@@ -123,7 +123,7 @@
BOOL _requiresUserActionForEditingControlsManager;
#endif
BOOL _initialCapitalizationEnabled;
- BOOL _shouldWaitForPaintAfterViewDidMoveToWindow;
+ BOOL _waitsForPaintAfterViewDidMoveToWindow;
#if ENABLE(APPLE_PAY)
BOOL _applePayEnabled;
@@ -175,7 +175,7 @@
_requiresUserActionForEditingControlsManager = NO;
#endif
_initialCapitalizationEnabled = YES;
- _shouldWaitForPaintAfterViewDidMoveToWindow = YES;
+ _waitsForPaintAfterViewDidMoveToWindow = YES;
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
_allowsAirPlayForMediaPlayback = YES;
@@ -286,7 +286,7 @@
configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
- configuration->_shouldWaitForPaintAfterViewDidMoveToWindow = self->_shouldWaitForPaintAfterViewDidMoveToWindow;
+ configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
@@ -658,14 +658,14 @@
_initialCapitalizationEnabled = initialCapitalizationEnabled;
}
-- (BOOL)_shouldWaitForPaintAfterViewDidMoveToWindow
+- (BOOL)_waitsForPaintAfterViewDidMoveToWindow
{
- return _shouldWaitForPaintAfterViewDidMoveToWindow;
+ return _waitsForPaintAfterViewDidMoveToWindow;
}
-- (void)_setShouldWaitForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
+- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
{
- _shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize;
+ _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
}
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-10-13 19:01:53 UTC (rev 207298)
@@ -55,7 +55,7 @@
@property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@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=_setShouldWaitForPaintAfterViewDidMoveToWindow:) BOOL _shouldWaitForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow 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 (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-13 19:01:53 UTC (rev 207298)
@@ -357,7 +357,7 @@
, m_initialCapitalizationEnabled(m_configuration->initialCapitalizationEnabled())
, m_backForwardList(WebBackForwardList::create(*this))
, m_maintainsInactiveSelection(false)
- , m_shouldWaitForPaintAfterViewDidMoveToWindow(m_configuration->shouldWaitForPaintAfterViewDidMoveToWindow())
+ , m_waitsForPaintAfterViewDidMoveToWindow(m_configuration->waitsForPaintAfterViewDidMoveToWindow())
, m_isEditable(false)
, m_textZoomFactor(1)
, m_pageZoomFactor(1)
@@ -1525,7 +1525,7 @@
bool isNowInWindow = (changed & ViewState::IsInWindow) && isInWindow();
// We always want to wait for the Web process to reply if we've been in-window before and are coming back in-window.
- if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent() && m_shouldWaitForPaintAfterViewDidMoveToWindow)
+ if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent() && m_waitsForPaintAfterViewDidMoveToWindow)
m_viewStateChangeWantsSynchronousReply = true;
// Don't wait synchronously if the view state is not visible. (This matters in particular on iOS, where a hidden page may be suspended.)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (207297 => 207298)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-13 18:57:27 UTC (rev 207297)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-13 19:01:53 UTC (rev 207298)
@@ -1653,7 +1653,7 @@
bool m_maintainsInactiveSelection;
- bool m_shouldWaitForPaintAfterViewDidMoveToWindow;
+ bool m_waitsForPaintAfterViewDidMoveToWindow;
String m_toolTip;