Changeset 146924 in webkit
- Timestamp:
- Mar 26, 2013 1:29:44 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r146922 r146924 1 2013-03-26 Tony Chang <tony@chromium.org> 2 3 Autogenerate the scrollAnimatorEnabled setting in Settings.in 4 https://bugs.webkit.org/show_bug.cgi?id=113253 5 6 Reviewed by James Robinson. 7 8 Convert scrollAnimatorEnabled into an autogenerated setting. This involves renaming 9 the setter from setEnableScrollAnimator(bool) to setScrollAnimatorEnabled(bool) and 10 updating the callers. I didn't change any WebKit API methods. 11 12 Also remove the code in InternalSettings since it's never used and will now be 13 autogenerated with proper resetting code. 14 15 No new tests, this is a refactor and should compile. 16 17 * page/Settings.cpp: 18 (WebCore::Settings::Settings): Remove code that is now autogenerated. 19 * page/Settings.h: 20 (Settings): Remove code that is now autogenerated. 21 * page/Settings.in: Add entry for scrollAnimatorEnabled. 22 * testing/InternalSettings.cpp: Remove unused code. 23 * testing/InternalSettings.h: Remove unused code. 24 * testing/InternalSettings.idl: Remove unused code. 25 1 26 2013-03-26 Joe Mason <jmason@blackberry.com> 2 27 -
trunk/Source/WebCore/page/Settings.cpp
r146704 r146924 192 192 , m_tiledBackingStoreEnabled(false) 193 193 , m_dnsPrefetchingEnabled(false) 194 #if ENABLE(SMOOTH_SCROLLING)195 , m_scrollAnimatorEnabled(true)196 #endif197 194 #if ENABLE(TOUCH_EVENTS) 198 195 , m_touchEventEmulationEnabled(false) -
trunk/Source/WebCore/page/Settings.h
r146704 r146924 234 234 static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 512; 235 235 236 #if ENABLE(SMOOTH_SCROLLING)237 void setEnableScrollAnimator(bool flag) { m_scrollAnimatorEnabled = flag; }238 bool scrollAnimatorEnabled() const { return m_scrollAnimatorEnabled; }239 #endif240 241 236 #if USE(SAFARI_THEME) 242 237 // Windows debugging pref (global) for switching between the Aqua look and a native windows look. … … 324 319 bool m_tiledBackingStoreEnabled : 1; 325 320 bool m_dnsPrefetchingEnabled : 1; 326 #if ENABLE(SMOOTH_SCROLLING)327 bool m_scrollAnimatorEnabled : 1;328 #endif329 321 330 322 #if ENABLE(TOUCH_EVENTS) -
trunk/Source/WebCore/page/Settings.in
r146835 r146924 146 146 shouldDisplayTextDescriptions initial=false, conditional=VIDEO_TRACK 147 147 scrollingCoordinatorEnabled initial=false 148 scrollAnimatorEnabled initial=true, conditional=SMOOTH_SCROLLING 148 149 notificationsEnabled initial=true 149 150 -
trunk/Source/WebCore/testing/InternalSettings.cpp
r146380 r146924 353 353 } 354 354 355 void InternalSettings::setEnableScrollAnimator(bool enabled, ExceptionCode& ec)356 {357 #if ENABLE(SMOOTH_SCROLLING)358 InternalSettingsGuardForSettings();359 settings()->setEnableScrollAnimator(enabled);360 #else361 UNUSED_PARAM(enabled);362 UNUSED_PARAM(ec);363 #endif364 }365 366 bool InternalSettings::scrollAnimatorEnabled(ExceptionCode& ec)367 {368 #if ENABLE(SMOOTH_SCROLLING)369 InternalSettingsGuardForSettingsReturn(false);370 return settings()->scrollAnimatorEnabled();371 #else372 UNUSED_PARAM(ec);373 return false;374 #endif375 }376 377 355 void InternalSettings::setCSSExclusionsEnabled(bool enabled, ExceptionCode& ec) 378 356 { -
trunk/Source/WebCore/testing/InternalSettings.h
r145940 r146924 114 114 void setResolutionOverride(int dotsPerCSSInchHorizontally, int dotsPerCSSInchVertically, ExceptionCode&); 115 115 void setMediaTypeOverride(const String& mediaType, ExceptionCode&); 116 void setEnableScrollAnimator(bool enabled, ExceptionCode&);117 bool scrollAnimatorEnabled(ExceptionCode&);118 116 void setCSSExclusionsEnabled(bool enabled, ExceptionCode&); 119 117 void setCSSVariablesEnabled(bool enabled, ExceptionCode&); -
trunk/Source/WebCore/testing/InternalSettings.idl
r145750 r146924 45 45 void setResolutionOverride(in long dotsPerCSSInchHorizontally, in long dotsPerCSSInchVertically) raises(DOMException); 46 46 void setMediaTypeOverride(in DOMString mediaTypeOverride) raises(DOMException); 47 void setEnableScrollAnimator(in boolean enabled) raises(DOMException);48 boolean scrollAnimatorEnabled() raises(DOMException);49 47 void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException); 50 48 void setCSSVariablesEnabled(in boolean enabled) raises(DOMException); -
trunk/Source/WebKit/chromium/ChangeLog
r146917 r146924 1 2013-03-26 Tony Chang <tony@chromium.org> 2 3 Autogenerate the scrollAnimatorEnabled setting in Settings.in 4 https://bugs.webkit.org/show_bug.cgi?id=113253 5 6 Reviewed by James Robinson. 7 8 * src/WebSettingsImpl.cpp: 9 (WebKit::WebSettingsImpl::setEnableScrollAnimator): Update call to WebCore to use setScrollAnimatorEnabled(bool). 10 1 11 2013-03-26 Tony Chang <tony@chromium.org> 2 12 -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r146917 r146924 620 620 { 621 621 #if ENABLE(SMOOTH_SCROLLING) 622 m_settings->set EnableScrollAnimator(enabled);622 m_settings->setScrollAnimatorEnabled(enabled); 623 623 #else 624 624 UNUSED_PARAM(enabled); -
trunk/Source/WebKit/gtk/ChangeLog
r146721 r146924 1 2013-03-26 Tony Chang <tony@chromium.org> 2 3 Autogenerate the scrollAnimatorEnabled setting in Settings.in 4 https://bugs.webkit.org/show_bug.cgi?id=113253 5 6 Reviewed by James Robinson. 7 8 * webkit/webkitwebview.cpp: 9 (webkit_web_view_update_settings): Update call to WebCore to use setScrollAnimatorEnabled(bool). 10 (webkit_web_view_settings_notify): Update call to WebCore to use setScrollAnimatorEnabled(bool). 11 1 12 2013-03-23 Carlos Garcia Campos <cgarcia@igalia.com> 2 13 -
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
r145818 r146924 3577 3577 3578 3578 #if ENABLE(SMOOTH_SCROLLING) 3579 coreSettings->set EnableScrollAnimator(settingsPrivate->enableSmoothScrolling);3579 coreSettings->setScrollAnimatorEnabled(settingsPrivate->enableSmoothScrolling); 3580 3580 #endif 3581 3581 … … 3724 3724 #if ENABLE(SMOOTH_SCROLLING) 3725 3725 else if (name == g_intern_string("enable-smooth-scrolling")) 3726 settings->set EnableScrollAnimator(g_value_get_boolean(&value));3726 settings->setScrollAnimatorEnabled(g_value_get_boolean(&value)); 3727 3727 #endif 3728 3728 -
trunk/Source/WebKit/qt/Api/qwebsettings.cpp
r145833 r146924 278 278 value = attributes.value(QWebSettings::ScrollAnimatorEnabled, 279 279 global->attributes.value(QWebSettings::ScrollAnimatorEnabled)); 280 settings->set EnableScrollAnimator(value);280 settings->setScrollAnimatorEnabled(value); 281 281 #endif 282 282 -
trunk/Source/WebKit/qt/ChangeLog
r146872 r146924 1 2013-03-26 Tony Chang <tony@chromium.org> 2 3 Autogenerate the scrollAnimatorEnabled setting in Settings.in 4 https://bugs.webkit.org/show_bug.cgi?id=113253 5 6 Reviewed by James Robinson. 7 8 * Api/qwebsettings.cpp: 9 (QWebSettingsPrivate::apply): Update call to WebCore to use setScrollAnimatorEnabled(bool). 10 1 11 2013-03-26 Csaba Osztrogonác <ossy@webkit.org> 2 12 -
trunk/Source/WebKit2/ChangeLog
r146915 r146924 1 2013-03-26 Tony Chang <tony@chromium.org> 2 3 Autogenerate the scrollAnimatorEnabled setting in Settings.in 4 https://bugs.webkit.org/show_bug.cgi?id=113253 5 6 Reviewed by James Robinson. 7 8 * WebProcess/WebPage/WebPage.cpp: 9 (WebKit::WebPage::setUseFixedLayout): Update call to WebCore to use setScrollAnimatorEnabled(bool). 10 (WebKit::WebPage::updatePreferences): Update call to WebCore to use setScrollAnimatorEnabled(bool). 11 1 12 2013-03-26 Andras Becsi <andras.becsi@digia.com> 2 13 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r146704 r146924 1255 1255 // Delegated scrolling will be enabled when the FrameView is created if fixed layout is enabled. 1256 1256 // Ensure we don't do animated scrolling in the WebProcess in that case. 1257 m_page->settings()->set EnableScrollAnimator(!fixed);1257 m_page->settings()->setScrollAnimatorEnabled(!fixed); 1258 1258 #endif 1259 1259 … … 2343 2343 settings->setRequestAnimationFrameEnabled(store.getBoolValueForKey(WebPreferencesKey::requestAnimationFrameEnabledKey())); 2344 2344 #if ENABLE(SMOOTH_SCROLLING) 2345 settings->set EnableScrollAnimator(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey()));2345 settings->setScrollAnimatorEnabled(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey())); 2346 2346 #endif 2347 2347 settings->setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
Note: See TracChangeset
for help on using the changeset viewer.