Index: content/shell/renderer/test_runner/WebTestProxy.h |
diff --git a/content/shell/renderer/test_runner/WebTestProxy.h b/content/shell/renderer/test_runner/WebTestProxy.h |
index 07597d3b6cd472ecbaeb1f267a85e10c4034c2ac..5ec505f246e42f33b65029e0f5b537b7ba6ad9bc 100644 |
--- a/content/shell/renderer/test_runner/WebTestProxy.h |
+++ b/content/shell/renderer/test_runner/WebTestProxy.h |
@@ -106,9 +106,6 @@ public: |
void setLogConsoleOutput(bool enabled); |
- // FIXME: Make this private again. |
- void scheduleComposite(); |
- |
void didOpenChooser(); |
void didCloseChooser(); |
bool isChooserShown(); |
@@ -136,7 +133,6 @@ protected: |
void didInvalidateRect(const blink::WebRect&); |
void didScrollRect(int, int, const blink::WebRect&); |
- void scheduleAnimation(); |
// FIXME: Remove once we switch to use didForceResize. |
void setWindowRect(const blink::WebRect&); |
void show(blink::WebNavigationPolicy); |
@@ -192,6 +188,9 @@ protected: |
bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent); |
void resetInputMethod(); |
+ void ScheduleComposite(); |
+ void ScheduleAnimation(); |
+ |
private: |
template<class, typename, typename> friend class WebFrameTestProxy; |
void locationChangeDone(blink::WebFrame*); |
@@ -255,14 +254,6 @@ public: |
{ |
WebTestProxyBase::didScrollRect(dx, dy, clipRect); |
} |
- virtual void scheduleComposite() |
- { |
- WebTestProxyBase::scheduleComposite(); |
- } |
- virtual void scheduleAnimation() |
- { |
- WebTestProxyBase::scheduleAnimation(); |
- } |
virtual void setWindowRect(const blink::WebRect& rect) |
{ |
WebTestProxyBase::setWindowRect(rect); |
@@ -528,6 +519,15 @@ public: |
WebTestProxyBase::postSpellCheckEvent(eventName); |
} |
+ // Override Base implementation |
+ virtual void ScheduleComposite() |
+ { |
+ WebTestProxyBase::ScheduleComposite(); |
+ } |
+ virtual void ScheduleAnimation() |
+ { |
+ WebTestProxyBase::ScheduleAnimation(); |
+ } |
private: |
DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |
}; |