Changeset 207298 in webkit


Ignore:
Timestamp:
Oct 13, 2016 12:01:53 PM (8 years ago)
Author:
timothy_horton@apple.com
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:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r207296 r207298  
     12016-10-13  Tim Horton  <timothy_horton@apple.com>
     2
     3        Rename the SPI added in r207292 due to post-landing review comments
     4        https://bugs.webkit.org/show_bug.cgi?id=163364
     5        <rdar://problem/28012494>
     6
     7        Reviewed by Simon Fraser.
     8
     9        * UIProcess/API/APIPageConfiguration.h:
     10        (API::PageConfiguration::waitsForPaintAfterViewDidMoveToWindow):
     11        (API::PageConfiguration::setWaitsForPaintAfterViewDidMoveToWindow):
     12        (API::PageConfiguration::shouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
     13        (API::PageConfiguration::setShouldWaitForPaintAfterViewDidMoveToWindow): Deleted.
     14        * UIProcess/API/Cocoa/WKWebView.mm:
     15        (-[WKWebView _initializeWithConfiguration:]):
     16        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
     17        (-[WKWebViewConfiguration init]):
     18        (-[WKWebViewConfiguration copyWithZone:]):
     19        (-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
     20        (-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
     21        (-[WKWebViewConfiguration _shouldWaitForPaintAfterViewDidMoveToWindow]): Deleted.
     22        (-[WKWebViewConfiguration _setShouldWaitForPaintAfterViewDidMoveToWindow:]): Deleted.
     23        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
     24        * UIProcess/WebPageProxy.cpp:
     25        (WebKit::WebPageProxy::WebPageProxy):
     26        (WebKit::WebPageProxy::dispatchViewStateChange):
     27        * UIProcess/WebPageProxy.h:
     28
    1292016-10-13  Jonathan Bedard  <jbedard@apple.com>
    230

  • trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h

    r207292 r207298  
    9393    void setInitialCapitalizationEnabled(bool initialCapitalizationEnabled) { m_initialCapitalizationEnabled = initialCapitalizationEnabled; }
    9494
    95     bool shouldWaitForPaintAfterViewDidMoveToWindow() const { return m_shouldWaitForPaintAfterViewDidMoveToWindow; }
    96     void setShouldWaitForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
     95    bool waitsForPaintAfterViewDidMoveToWindow() const { return m_waitsForPaintAfterViewDidMoveToWindow; }
     96    void setWaitsForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
    9797
    9898private:
    … …  
    116116#endif
    117117    bool m_initialCapitalizationEnabled = true;
    118     bool m_shouldWaitForPaintAfterViewDidMoveToWindow = true;
     118    bool m_waitsForPaintAfterViewDidMoveToWindow = true;
    119119};
    120120

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r207292 r207298  
    439439    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
    440440    pageConfiguration->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
    441     pageConfiguration->setShouldWaitForPaintAfterViewDidMoveToWindow([_configuration _shouldWaitForPaintAfterViewDidMoveToWindow]);
     441    pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
    442442
    443443#if PLATFORM(MAC)

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

    r207292 r207298  
    124124#endif
    125125    BOOL _initialCapitalizationEnabled;
    126     BOOL _shouldWaitForPaintAfterViewDidMoveToWindow;
     126    BOOL _waitsForPaintAfterViewDidMoveToWindow;
    127127
    128128#if ENABLE(APPLE_PAY)
    … …  
    176176#endif
    177177    _initialCapitalizationEnabled = YES;
    178     _shouldWaitForPaintAfterViewDidMoveToWindow = YES;
     178    _waitsForPaintAfterViewDidMoveToWindow = YES;
    179179
    180180#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    … …  
    287287    configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
    288288    configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
    289     configuration->_shouldWaitForPaintAfterViewDidMoveToWindow = self->_shouldWaitForPaintAfterViewDidMoveToWindow;
     289    configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
    290290
    291291#if PLATFORM(IOS)
    … …  
    659659}
    660660
    661 - (BOOL)_shouldWaitForPaintAfterViewDidMoveToWindow
    662 {
    663     return _shouldWaitForPaintAfterViewDidMoveToWindow;
    664 }
    665 
    666 - (void)_setShouldWaitForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
    667 {
    668     _shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize;
     661- (BOOL)_waitsForPaintAfterViewDidMoveToWindow
     662{
     663    return _waitsForPaintAfterViewDidMoveToWindow;
     664}
     665
     666- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
     667{
     668    _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
    669669}
    670670

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r207292 r207298  
    5656@property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
    5757@property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
    58 @property (nonatomic, setter=_setShouldWaitForPaintAfterViewDidMoveToWindow:) BOOL _shouldWaitForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     58@property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5959
    6060#if TARGET_OS_IPHONE

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r207292 r207298  
    358358    , m_backForwardList(WebBackForwardList::create(*this))
    359359    , m_maintainsInactiveSelection(false)
    360     , m_shouldWaitForPaintAfterViewDidMoveToWindow(m_configuration->shouldWaitForPaintAfterViewDidMoveToWindow())
     360    , m_waitsForPaintAfterViewDidMoveToWindow(m_configuration->waitsForPaintAfterViewDidMoveToWindow())
    361361    , m_isEditable(false)
    362362    , m_textZoomFactor(1)
    … …  
    15261526    bool isNowInWindow = (changed & ViewState::IsInWindow) && isInWindow();
    15271527    // We always want to wait for the Web process to reply if we've been in-window before and are coming back in-window.
    1528     if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent() && m_shouldWaitForPaintAfterViewDidMoveToWindow)
     1528    if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent() && m_waitsForPaintAfterViewDidMoveToWindow)
    15291529        m_viewStateChangeWantsSynchronousReply = true;
    15301530

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r207292 r207298  
    16541654    bool m_maintainsInactiveSelection;
    16551655
    1656     bool m_shouldWaitForPaintAfterViewDidMoveToWindow;
     1656    bool m_waitsForPaintAfterViewDidMoveToWindow;
    16571657
    16581658    String m_toolTip;
Note: See TracChangeset for help on using the changeset viewer.