From e034b592d0274d4fac4554255f85bae79c5749a0 Mon Sep 17 00:00:00 2001 From: "aestes@apple.com" Date: Fri, 24 Feb 2012 06:24:47 +0000 Subject: [PATCH] Rename [setS|s]uppressIncrementalRendering to [setS|s]uppressesIncrementalRendering and make it WebPreferences API. https://bugs.webkit.org/show_bug.cgi?id=79433 Reviewed by Dan Bernstein. Source/WebCore: * dom/Document.cpp: (WebCore::Document::implicitClose): (WebCore::Document::visualUpdatesAllowed): * page/Settings.cpp: (WebCore::Settings::Settings): * page/Settings.h: (WebCore::Settings::setSuppressesIncrementalRendering): (WebCore::Settings::suppressesIncrementalRendering): (Settings): Source/WebKit/mac: * WebCoreSupport/WebInspectorClient.mm: (-[WebInspectorWindowController init]): * WebView/WebPreferenceKeysPrivate.h: * WebView/WebPreferences.h: * WebView/WebPreferences.mm: (+[WebPreferences initialize]): (-[WebPreferences setSuppressesIncrementalRendering:]): (-[WebPreferences suppressesIncrementalRendering]): (-[WebPreferences setSuppressIncrementalRendering:]): (-[WebPreferences suppressIncrementalRendering]): * WebView/WebView.mm: (-[WebView _preferencesChanged:]): Source/WebKit2: * Shared/WebPreferencesStore.h: (WebKit): * UIProcess/API/C/WKPreferences.cpp: (WKPreferencesSetSuppressesIncrementalRendering): (WKPreferencesGetSuppressesIncrementalRendering): * UIProcess/API/C/WKPreferences.h: * UIProcess/WebInspectorProxy.cpp: (WebKit::createInspectorPageGroup): * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidFirstLayout): * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updatePreferences): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108730 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 17 +++++++++++++++++ Source/WebCore/dom/Document.cpp | 4 ++-- Source/WebCore/page/Settings.cpp | 2 +- Source/WebCore/page/Settings.h | 6 +++--- Source/WebKit/mac/ChangeLog | 20 ++++++++++++++++++++ .../WebKit/mac/WebCoreSupport/WebInspectorClient.mm | 2 +- Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h | 2 +- Source/WebKit/mac/WebView/WebPreferences.h | 13 +++++++++++++ Source/WebKit/mac/WebView/WebPreferences.mm | 17 ++++++++++++++--- Source/WebKit/mac/WebView/WebPreferencesPrivate.h | 1 + Source/WebKit/mac/WebView/WebView.mm | 2 +- Source/WebKit2/ChangeLog | 20 ++++++++++++++++++++ Source/WebKit2/Shared/WebPreferencesStore.h | 2 +- Source/WebKit2/UIProcess/API/C/WKPreferences.cpp | 8 ++++---- Source/WebKit2/UIProcess/API/C/WKPreferences.h | 4 ++-- Source/WebKit2/UIProcess/WebInspectorProxy.cpp | 2 +- .../WebCoreSupport/WebFrameLoaderClient.cpp | 2 +- Source/WebKit2/WebProcess/WebPage/WebPage.cpp | 2 +- 18 files changed, 104 insertions(+), 22 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 2d6c68c..1842be0 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,20 @@ +2012-02-23 Andy Estes + + Rename [setS|s]uppressIncrementalRendering to [setS|s]uppressesIncrementalRendering and make it WebPreferences API. + https://bugs.webkit.org/show_bug.cgi?id=79433 + + Reviewed by Dan Bernstein. + + * dom/Document.cpp: + (WebCore::Document::implicitClose): + (WebCore::Document::visualUpdatesAllowed): + * page/Settings.cpp: + (WebCore::Settings::Settings): + * page/Settings.h: + (WebCore::Settings::setSuppressesIncrementalRendering): + (WebCore::Settings::suppressesIncrementalRendering): + (Settings): + 2012-02-23 Erik Arvidsson Rename DOMWindow to Window in the bindings diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 5751f14..e85d22f 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -2331,7 +2331,7 @@ void Document::implicitClose() } // If painting and compositing layer updates were suppressed pending the load event, do these actions now. - if (renderer() && settings() && settings()->suppressIncrementalRendering()) { + if (renderer() && settings() && settings()->suppressesIncrementalRendering()) { #if USE(ACCELERATED_COMPOSITING) view()->updateCompositingLayers(); #endif @@ -5437,7 +5437,7 @@ void Document::didRemoveTouchEventHandler() bool Document::visualUpdatesAllowed() const { return !settings() - || !settings()->suppressIncrementalRendering() + || !settings()->suppressesIncrementalRendering() || loadEventFinished(); } diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index 937d994..ec50f88 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -228,7 +228,7 @@ Settings::Settings(Page* page) , m_mediaPlaybackRequiresUserGesture(false) , m_mediaPlaybackAllowsInline(true) , m_passwordEchoEnabled(false) - , m_suppressIncrementalRendering(false) + , m_suppressesIncrementalRendering(false) , m_backspaceKeyNavigationEnabled(true) , m_visualWordMovementEnabled(false) #if ENABLE(VIDEO_TRACK) diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h index 0be7ec0..d3906f1 100644 --- a/Source/WebCore/page/Settings.h +++ b/Source/WebCore/page/Settings.h @@ -483,8 +483,8 @@ namespace WebCore { void setPasswordEchoEnabled(bool flag) { m_passwordEchoEnabled = flag; } bool passwordEchoEnabled() const { return m_passwordEchoEnabled; } - void setSuppressIncrementalRendering(bool flag) { m_suppressIncrementalRendering = flag; } - bool suppressIncrementalRendering() const { return m_suppressIncrementalRendering; } + void setSuppressesIncrementalRendering(bool flag) { m_suppressesIncrementalRendering = flag; } + bool suppressesIncrementalRendering() const { return m_suppressesIncrementalRendering; } void setBackspaceKeyNavigationEnabled(bool flag) { m_backspaceKeyNavigationEnabled = flag; } bool backspaceKeyNavigationEnabled() const { return m_backspaceKeyNavigationEnabled; } @@ -669,7 +669,7 @@ namespace WebCore { bool m_mediaPlaybackRequiresUserGesture : 1; bool m_mediaPlaybackAllowsInline : 1; bool m_passwordEchoEnabled : 1; - bool m_suppressIncrementalRendering : 1; + bool m_suppressesIncrementalRendering : 1; bool m_backspaceKeyNavigationEnabled : 1; bool m_visualWordMovementEnabled : 1; diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index 208638f..548c8f1 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,23 @@ +2012-02-23 Andy Estes + + Rename [setS|s]uppressIncrementalRendering to [setS|s]uppressesIncrementalRendering and make it WebPreferences API. + https://bugs.webkit.org/show_bug.cgi?id=79433 + + Reviewed by Dan Bernstein. + + * WebCoreSupport/WebInspectorClient.mm: + (-[WebInspectorWindowController init]): + * WebView/WebPreferenceKeysPrivate.h: + * WebView/WebPreferences.h: + * WebView/WebPreferences.mm: + (+[WebPreferences initialize]): + (-[WebPreferences setSuppressesIncrementalRendering:]): + (-[WebPreferences suppressesIncrementalRendering]): + (-[WebPreferences setSuppressIncrementalRendering:]): + (-[WebPreferences suppressIncrementalRendering]): + * WebView/WebView.mm: + (-[WebView _preferencesChanged:]): + 2012-02-22 Hajime Morrita NOTIFICATIONS should be implemented as PageSupplement diff --git a/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm index 14ebd1d..2ae8659 100644 --- a/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm +++ b/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm @@ -240,7 +240,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const [preferences setMinimumFontSize:0]; [preferences setMinimumLogicalFontSize:9]; [preferences setPlugInsEnabled:NO]; - [preferences setSuppressIncrementalRendering:YES]; + [preferences setSuppressesIncrementalRendering:YES]; [preferences setTabsToLinks:NO]; [preferences setUserStyleSheetEnabled:NO]; diff --git a/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h b/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h index 22ca342..261a30e 100644 --- a/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h +++ b/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h @@ -118,6 +118,7 @@ #define WebKitShouldDisplayCaptionsPreferenceKey @"WebKitShouldDisplayCaptions" #define WebKitShouldDisplayTextDescriptionsPreferenceKey @"WebKitShouldDisplayTextDescriptions" #define WebKitNotificationsEnabledKey @"WebKitNotificationsEnabled" +#define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering" // These are private both because callers should be using the cover methods and because the // cover methods themselves are private. @@ -132,7 +133,6 @@ #define WebKitTextDirectionSubmenuInclusionBehaviorPreferenceKey @"WebKitTextDirectionSubmenuInclusionBehaviorPreferenceKey" #define WebKitEditingBehaviorPreferenceKey @"WebKitEditingBehavior" #define WebKitUsePreHTML5ParserQuirksKey @"WebKitUsePreHTML5ParserQuirks" -#define WebKitSuppressIncrementalRenderingKey @"WebKitSuppressIncrementalRendering" #define WebKitBackspaceKeyNavigationEnabledKey @"WebKitBackspaceKeyNavigationEnabled" // CoreGraphics deferred updates are disabled if WebKitEnableCoalescedUpdatesPreferenceKey is set diff --git a/Source/WebKit/mac/WebView/WebPreferences.h b/Source/WebKit/mac/WebView/WebPreferences.h index 03ae412..6e01709 100644 --- a/Source/WebKit/mac/WebView/WebPreferences.h +++ b/Source/WebKit/mac/WebView/WebPreferences.h @@ -431,4 +431,17 @@ caching behavior. */ - (WebCacheModel)cacheModel; +/*! + @method setSuppressesIncrementalRendering: + @param suppressesIncrementalRendering YES to suppress incremental rendering; + NO otherwise. +*/ +- (void)setSuppressesIncrementalRendering:(BOOL)suppressesIncrementalRendering; + +/*! + @method suppressesIncrementalRendering + @result YES if the WebView suppresses incremental rendering; NO otherwise. +*/ +- (BOOL)suppressesIncrementalRendering; + @end diff --git a/Source/WebKit/mac/WebView/WebPreferences.mm b/Source/WebKit/mac/WebView/WebPreferences.mm index 8a801a7..ed23910 100644 --- a/Source/WebKit/mac/WebView/WebPreferences.mm +++ b/Source/WebKit/mac/WebView/WebPreferences.mm @@ -389,7 +389,7 @@ static WebCacheModel cacheModelForMainBundle(void) [NSNumber numberWithBool:NO], WebKitMediaPlaybackRequiresUserGesturePreferenceKey, [NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey, [NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey, - [NSNumber numberWithBool:NO], WebKitSuppressIncrementalRenderingKey, + [NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey, [NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey, [NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey, [NSNumber numberWithBool:NO], WebKitShouldDisplayCaptionsPreferenceKey, @@ -808,6 +808,17 @@ static WebCacheModel cacheModelForMainBundle(void) return [self _integerValueForKey:WebKitCacheModelPreferenceKey]; } + +- (void)setSuppressesIncrementalRendering:(BOOL)suppressesIncrementalRendering +{ + [self _setBoolValue:suppressesIncrementalRendering forKey:WebKitSuppressesIncrementalRenderingKey]; +} + +- (BOOL)suppressesIncrementalRendering +{ + return [self _boolValueForKey:WebKitSuppressesIncrementalRenderingKey]; +} + @end @implementation WebPreferences (WebPrivate) @@ -1595,12 +1606,12 @@ static NSString *classIBCreatorID = nil; - (void)setSuppressIncrementalRendering:(BOOL)flag { - [self _setBoolValue:flag forKey:WebKitSuppressIncrementalRenderingKey]; + [self _setBoolValue:flag forKey:WebKitSuppressesIncrementalRenderingKey]; } - (BOOL)suppressIncrementalRendering { - return [self _boolValueForKey:WebKitSuppressIncrementalRenderingKey]; + return [self _boolValueForKey:WebKitSuppressesIncrementalRenderingKey]; } - (void)setBackspaceKeyNavigationEnabled:(BOOL)flag diff --git a/Source/WebKit/mac/WebView/WebPreferencesPrivate.h b/Source/WebKit/mac/WebView/WebPreferencesPrivate.h index 890d206..29a8be1 100644 --- a/Source/WebKit/mac/WebView/WebPreferencesPrivate.h +++ b/Source/WebKit/mac/WebView/WebPreferencesPrivate.h @@ -274,6 +274,7 @@ extern NSString *WebPreferencesChangedInternalNotification; - (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag; - (BOOL)isHixie76WebSocketProtocolEnabled; +// Deprecated. You should use [setS|s]uppressesIncrementalRendering in WebPreferences.h instead. - (void)setSuppressIncrementalRendering:(BOOL)flag; - (BOOL)suppressIncrementalRendering; diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm index 8c1d5dd..9b72202 100644 --- a/Source/WebKit/mac/WebView/WebView.mm +++ b/Source/WebKit/mac/WebView/WebView.mm @@ -1507,7 +1507,7 @@ static bool needsSelfRetainWhileLoadingQuirk() #endif settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]); settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]); - settings->setSuppressIncrementalRendering([preferences suppressIncrementalRendering]); + settings->setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]); settings->setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]); settings->setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]); diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 0e40fa4..26efb40 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,23 @@ +2012-02-23 Andy Estes + + Rename [setS|s]uppressIncrementalRendering to [setS|s]uppressesIncrementalRendering and make it WebPreferences API. + https://bugs.webkit.org/show_bug.cgi?id=79433 + + Reviewed by Dan Bernstein. + + * Shared/WebPreferencesStore.h: + (WebKit): + * UIProcess/API/C/WKPreferences.cpp: + (WKPreferencesSetSuppressesIncrementalRendering): + (WKPreferencesGetSuppressesIncrementalRendering): + * UIProcess/API/C/WKPreferences.h: + * UIProcess/WebInspectorProxy.cpp: + (WebKit::createInspectorPageGroup): + * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: + (WebKit::WebFrameLoaderClient::dispatchDidFirstLayout): + * WebProcess/WebPage/WebPage.cpp: + (WebKit::WebPage::updatePreferences): + 2012-02-23 Mario Sanchez Prada [GTK] Wrong signal name on emission in WebKitWindowProperties.cpp diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h index 52e0820..cb70309 100644 --- a/Source/WebKit2/Shared/WebPreferencesStore.h +++ b/Source/WebKit2/Shared/WebPreferencesStore.h @@ -99,7 +99,7 @@ namespace WebKit { macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \ macro(WebAudioEnabled, webAudioEnabled, Bool, bool, false) \ macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \ - macro(SuppressIncrementalRendering, suppressIncrementalRendering, Bool, bool, false) \ + macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \ macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \ macro(CaretBrowsingEnabled, caretBrowsingEnabled, Bool, bool, false) \ macro(ShouldDisplaySubtitles, shouldDisplaySubtitles, Bool, bool, false) \ diff --git a/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp b/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp index e076b53..87d32ed 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp +++ b/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp @@ -678,14 +678,14 @@ bool WKPreferencesGetApplicationChromeModeEnabled(WKPreferencesRef preferencesRe return toImpl(preferencesRef)->applicationChromeMode(); } -void WKPreferencesSetSuppressIncrementalRendering(WKPreferencesRef preferencesRef, bool enabled) +void WKPreferencesSetSuppressesIncrementalRendering(WKPreferencesRef preferencesRef, bool enabled) { - toImpl(preferencesRef)->setSuppressIncrementalRendering(enabled); + toImpl(preferencesRef)->setSuppressesIncrementalRendering(enabled); } -bool WKPreferencesGetSuppressIncrementalRendering(WKPreferencesRef preferencesRef) +bool WKPreferencesGetSuppressesIncrementalRendering(WKPreferencesRef preferencesRef) { - return toImpl(preferencesRef)->suppressIncrementalRendering(); + return toImpl(preferencesRef)->suppressesIncrementalRendering(); } void WKPreferencesSetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled) diff --git a/Source/WebKit2/UIProcess/API/C/WKPreferences.h b/Source/WebKit2/UIProcess/API/C/WKPreferences.h index f13559a..8054e00 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPreferences.h +++ b/Source/WebKit2/UIProcess/API/C/WKPreferences.h @@ -170,8 +170,8 @@ WK_EXPORT void WKPreferencesSetWebAudioEnabled(WKPreferencesRef preferencesRef, WK_EXPORT bool WKPreferencesGetWebAudioEnabled(WKPreferencesRef preferencesRef); // Defaults to false -WK_EXPORT void WKPreferencesSetSuppressIncrementalRendering(WKPreferencesRef preferencesRef, bool enabled); -WK_EXPORT bool WKPreferencesGetSuppressIncrementalRendering(WKPreferencesRef preferencesRef); +WK_EXPORT void WKPreferencesSetSuppressesIncrementalRendering(WKPreferencesRef preferencesRef, bool enabled); +WK_EXPORT bool WKPreferencesGetSuppressesIncrementalRendering(WKPreferencesRef preferencesRef); // Defaults to true WK_EXPORT void WKPreferencesSetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled); diff --git a/Source/WebKit2/UIProcess/WebInspectorProxy.cpp b/Source/WebKit2/UIProcess/WebInspectorProxy.cpp index 9f8941d..6da04a9 100644 --- a/Source/WebKit2/UIProcess/WebInspectorProxy.cpp +++ b/Source/WebKit2/UIProcess/WebInspectorProxy.cpp @@ -55,7 +55,7 @@ static PassRefPtr createInspectorPageGroup() #endif pageGroup->preferences()->setApplicationChromeModeEnabled(true); - pageGroup->preferences()->setSuppressIncrementalRendering(true); + pageGroup->preferences()->setSuppressesIncrementalRendering(true); return pageGroup.release(); } diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp index f35ab5f..49d3b84 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -537,7 +537,7 @@ void WebFrameLoaderClient::dispatchDidFirstLayout() // Notify the UIProcess. webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get()))); - if (m_frame == m_frame->page()->mainWebFrame() && !webPage->corePage()->settings()->suppressIncrementalRendering()) + if (m_frame == m_frame->page()->mainWebFrame() && !webPage->corePage()->settings()->suppressesIncrementalRendering()) webPage->drawingArea()->setLayerTreeStateIsFrozen(false); } diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index 2c1c399..dad8104 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -1926,7 +1926,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store) #endif settings->setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey())); - settings->setSuppressIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressIncrementalRenderingKey())); + settings->setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey())); settings->setBackspaceKeyNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::backspaceKeyNavigationEnabledKey())); settings->setCaretBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::caretBrowsingEnabledKey())); -- 2.7.4