summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/shell/renderer/test_runner/WebTestProxy.cpp5
-rw-r--r--content/shell/renderer/test_runner/WebTestProxy.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
index 70bb6b7..99069ba 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -738,6 +738,11 @@ void WebTestProxyBase::animateNow()
}
}
+bool WebTestProxyBase::isCompositorFramePending() const
+{
+ return m_animateScheduled || !m_paintRect.isEmpty();
+}
+
void WebTestProxyBase::show(WebNavigationPolicy)
{
invalidateAll();
diff --git a/content/shell/renderer/test_runner/WebTestProxy.h b/content/shell/renderer/test_runner/WebTestProxy.h
index a5680c5..111cb101 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.h
+++ b/content/shell/renderer/test_runner/WebTestProxy.h
@@ -134,6 +134,7 @@ protected:
void didInvalidateRect(const blink::WebRect&);
void didScrollRect(int, int, const blink::WebRect&);
void scheduleAnimation();
+ bool isCompositorFramePending() const;
// FIXME: Remove once we switch to use didForceResize.
void setWindowRect(const blink::WebRect&);
void show(blink::WebNavigationPolicy);
@@ -258,6 +259,10 @@ public:
{
WebTestProxyBase::scheduleAnimation();
}
+ virtual bool isCompositorFramePending() const
+ {
+ return WebTestProxyBase::isCompositorFramePending();
+ }
virtual void setWindowRect(const blink::WebRect& rect)
{
WebTestProxyBase::setWindowRect(rect);