Diff
Modified: trunk/Source/WebCore/ChangeLog (112195 => 112196)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 02:41:20 UTC (rev 112196)
@@ -1,3 +1,24 @@
+2012-03-26 Scott Byer <[email protected]>
+
+ Enable layout testing of the scroll animator.
+ https://bugs.webkit.org/show_bug.cgi?id=81858
+ Add a call to the InternalSettings that layout tests can use to
+ turn on scroll animation. Enable animation updates for the
+ Chromium platform DRT when scroll animation has been turned on in
+ a test. This should be a no-op for all current layout tests.
+
+ Reviewed by James Robinson.
+
+ No new tests. Layout test results should be unchanged.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::setEnableScrollAnimator):
+ (WebCore):
+ (WebCore::InternalSettings::scrollAnimatorEnabled):
+ * testing/InternalSettings.h:
+ (InternalSettings):
+ * testing/InternalSettings.idl:
+
2012-03-26 Charles Wei <[email protected]>
Fix minor spell error in DocumentLoader.h
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (112195 => 112196)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-03-27 02:41:20 UTC (rev 112196)
@@ -295,4 +295,26 @@
setFontFamily(settings(), family, script, &Settings::setPictographFontFamily);
}
+void InternalSettings::setEnableScrollAnimator(bool enabled, ExceptionCode& ec)
+{
+#if ENABLE(SMOOTH_SCROLLING)
+ InternalSettingsGuardForSettings();
+ settings()->setEnableScrollAnimator(enabled);
+#else
+ UNUSED_PARAM(enabled);
+ UNUSED_PARAM(ec);
+#endif
}
+
+bool InternalSettings::scrollAnimatorEnabled(ExceptionCode& ec)
+{
+#if ENABLE(SMOOTH_SCROLLING)
+ InternalSettingsGuardForSettingsReturn(false);
+ return settings()->scrollAnimatorEnabled();
+#else
+ UNUSED_PARAM(ec);
+ return false;
+#endif
+}
+
+}
Modified: trunk/Source/WebCore/testing/InternalSettings.h (112195 => 112196)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-03-27 02:41:20 UTC (rev 112196)
@@ -70,6 +70,8 @@
void setCursiveFontFamily(const String& family, const String& script, ExceptionCode&);
void setFantasyFontFamily(const String& family, const String& script, ExceptionCode&);
void setPictographFontFamily(const String& family, const String& script, ExceptionCode&);
+ void setEnableScrollAnimator(bool enabled, ExceptionCode&);
+ bool scrollAnimatorEnabled(ExceptionCode&);
void restoreTo(Settings*);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (112195 => 112196)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2012-03-27 02:41:20 UTC (rev 112196)
@@ -49,6 +49,8 @@
void setCursiveFontFamily(in DOMString family, in DOMString script) raises(DOMException);
void setFantasyFontFamily(in DOMString family, in DOMString script) raises(DOMException);
void setPictographFontFamily(in DOMString family, in DOMString script) raises(DOMException);
+ void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
+ boolean scrollAnimatorEnabled() raises(DOMException);
};
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (112195 => 112196)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-27 02:41:20 UTC (rev 112196)
@@ -1,3 +1,21 @@
+2012-03-26 Scott Byer <[email protected]>
+
+ Enable layout testing of the scroll animator.
+ https://bugs.webkit.org/show_bug.cgi?id=81858
+ Add a call to the InternalSettings that layout tests can use to
+ turn on scroll animation. Enable animation updates for the
+ Chromium platform DRT when scroll animation has been turned on in
+ a test. This should be a no-op for all current layout tests.
+
+ Reviewed by James Robinson.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::scrollAnimatorEnabled):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-03-26 Nat Duca <[email protected]>
[chromium] Add isInputThrottled/didBecomeReadyForAdditionalInput to WebWidget
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (112195 => 112196)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-03-27 02:41:20 UTC (rev 112196)
@@ -139,6 +139,7 @@
virtual void setPasswordEchoDurationInSeconds(double) = 0;
virtual void setShouldPrintBackgrounds(bool) = 0;
virtual void setEnableScrollAnimator(bool) = 0;
+ virtual bool scrollAnimatorEnabled() const = 0;
virtual void setHixie76WebSocketProtocolEnabled(bool) = 0;
virtual void setVisualWordMovementEnabled(bool) = 0;
virtual void setAcceleratedPaintingEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (112195 => 112196)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-03-27 02:41:20 UTC (rev 112196)
@@ -498,6 +498,15 @@
#endif
}
+bool WebSettingsImpl::scrollAnimatorEnabled() const
+{
+#if ENABLE(SMOOTH_SCROLLING)
+ return m_settings->scrollAnimatorEnabled();
+#else
+ return false;
+#endif
+}
+
void WebSettingsImpl::setHixie76WebSocketProtocolEnabled(bool enabled)
{
#if ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (112195 => 112196)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-03-27 02:41:20 UTC (rev 112196)
@@ -131,6 +131,7 @@
virtual void setPasswordEchoDurationInSeconds(double);
virtual void setShouldPrintBackgrounds(bool);
virtual void setEnableScrollAnimator(bool);
+ virtual bool scrollAnimatorEnabled() const;
virtual void setHixie76WebSocketProtocolEnabled(bool);
virtual void setVisualWordMovementEnabled(bool);
virtual void setShouldDisplaySubtitles(bool);
Modified: trunk/Tools/ChangeLog (112195 => 112196)
--- trunk/Tools/ChangeLog 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Tools/ChangeLog 2012-03-27 02:41:20 UTC (rev 112196)
@@ -1,3 +1,20 @@
+2012-03-26 Scott Byer <[email protected]>
+
+ Enable layout testing of the scroll animator.
+ https://bugs.webkit.org/show_bug.cgi?id=81858
+ Add a call to the InternalSettings that layout tests can use to
+ turn on scroll animation. Enable animation updates for the
+ Chromium platform DRT when scroll animation has been turned on in
+ a test. This should be a no-op for all current layout tests.
+
+ Reviewed by James Robinson.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::serviceAnimation):
+ (WebViewHost::scheduleAnimation):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-03-26 Dinu Jacob <[email protected]>
[Qt][WK2] Support multi-file upload
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (112195 => 112196)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-27 02:41:20 UTC (rev 112196)
@@ -757,9 +757,16 @@
}
#if ENABLE(REQUEST_ANIMATION_FRAME)
+void WebViewHost::serviceAnimation()
+{
+ if (webView()->settings()->scrollAnimatorEnabled())
+ webView()->animate(0.0);
+ scheduleComposite();
+}
+
void WebViewHost::scheduleAnimation()
{
- postDelayedTask(new HostMethodTask(this, &WebViewHost::scheduleComposite), 0);
+ postDelayedTask(new HostMethodTask(this, &WebViewHost::serviceAnimation), 0);
}
#endif
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (112195 => 112196)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-03-27 02:29:41 UTC (rev 112195)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-03-27 02:41:20 UTC (rev 112196)
@@ -175,6 +175,7 @@
virtual void didAutoResize(const WebKit::WebSize& newSize);
virtual void scheduleComposite();
#if ENABLE(REQUEST_ANIMATION_FRAME)
+ virtual void serviceAnimation();
virtual void scheduleAnimation();
#endif
virtual void didFocus();
