Title: [94214] trunk
- Revision
- 94214
- Author
- tha...@chromium.org
- Date
- 2011-08-31 12:08:24 -0700 (Wed, 31 Aug 2011)
Log Message
Make ScrollAnimator(Chromium)?Mac check scrollAnimatorEnabled()
https://bugs.webkit.org/show_bug.cgi?id=67297
Reviewed by Tony Chang.
Source/WebCore:
I need this to disable smooth scrolling in chromium tests. I'm making
the change to ScrollAnimatorMac to make unforking the file easier. I
changed scrollAnimatorEnabled() to default to true so that this change
is a no-op for Safari; in chromium the flag is set explicitly to true
or false anyway.
* page/Settings.cpp:
(WebCore::Settings::Settings):
* platform/chromium/ScrollAnimatorChromiumMac.mm:
(WebCore::ScrollAnimatorChromiumMac::scroll):
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::scroll):
Tools:
Explicitly disable smooth scrolling in chromium's DRT.
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::applyTo):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94213 => 94214)
--- trunk/Source/WebCore/ChangeLog 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Source/WebCore/ChangeLog 2011-08-31 19:08:24 UTC (rev 94214)
@@ -1,3 +1,23 @@
+2011-08-31 Nico Weber <tha...@chromium.org>
+
+ Make ScrollAnimator(Chromium)?Mac check scrollAnimatorEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=67297
+
+ Reviewed by Tony Chang.
+
+ I need this to disable smooth scrolling in chromium tests. I'm making
+ the change to ScrollAnimatorMac to make unforking the file easier. I
+ changed scrollAnimatorEnabled() to default to true so that this change
+ is a no-op for Safari; in chromium the flag is set explicitly to true
+ or false anyway.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * platform/chromium/ScrollAnimatorChromiumMac.mm:
+ (WebCore::ScrollAnimatorChromiumMac::scroll):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::scroll):
+
2011-08-31 Nate Chapin <jap...@chromium.org>
Don't load resources with empty urls, since this
Modified: trunk/Source/WebCore/page/Settings.cpp (94213 => 94214)
--- trunk/Source/WebCore/page/Settings.cpp 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-08-31 19:08:24 UTC (rev 94214)
@@ -207,7 +207,7 @@
, m_allowDisplayOfInsecureContent(true)
, m_allowRunningOfInsecureContent(true)
#if ENABLE(SMOOTH_SCROLLING)
- , m_scrollAnimatorEnabled(false)
+ , m_scrollAnimatorEnabled(true)
#endif
#if ENABLE(WEB_SOCKETS)
, m_useHixie76WebSocketProtocol(true)
Modified: trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm (94213 => 94214)
--- trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-08-31 19:08:24 UTC (rev 94214)
@@ -506,7 +506,7 @@
return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
#endif
- if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"])
+ if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"] || !m_scrollableArea->scrollAnimatorEnabled())
return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
if (granularity == ScrollByPixel)
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (94213 => 94214)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-08-31 19:08:24 UTC (rev 94214)
@@ -496,7 +496,7 @@
{
m_haveScrolledSincePageLoad = true;
- if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"])
+ if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"] || !m_scrollableArea->scrollAnimatorEnabled())
return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
if (granularity == ScrollByPixel)
Modified: trunk/Tools/ChangeLog (94213 => 94214)
--- trunk/Tools/ChangeLog 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Tools/ChangeLog 2011-08-31 19:08:24 UTC (rev 94214)
@@ -1,3 +1,15 @@
+2011-08-31 Nico Weber <tha...@chromium.org>
+
+ Make ScrollAnimator(Chromium)?Mac check scrollAnimatorEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=67297
+
+ Reviewed by Tony Chang.
+
+ Explicitly disable smooth scrolling in chromium's DRT.
+
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::applyTo):
+
2011-08-31 Oliver Hunt <oli...@apple.com>
Add Checked<> tests to windows build
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (94213 => 94214)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-08-31 19:01:08 UTC (rev 94213)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-08-31 19:08:24 UTC (rev 94214)
@@ -176,6 +176,7 @@
settings->setAllowScriptsToCloseWindows(false);
settings->setNeedsSiteSpecificQuirks(true);
settings->setEditableLinkBehaviorNeverLive();
+ settings->setEnableScrollAnimator(false);
settings->setFontRenderingModeNormal();
settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
settings->setUsesEncodingDetector(false);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
