| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 9223933bd9f36f7ccac21188b2ef913fd6e560f5..cf3be01db9a0f3caf1a63bfa92e9a67d0f335e52 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -33,6 +33,7 @@ public:
|
| // Proxy implementation
|
| virtual bool compositeAndReadback(void *pixels, const gfx::Rect&) OVERRIDE;
|
| virtual void startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration) OVERRIDE;
|
| + virtual void programmaticScroll(gfx::Vector2d targetOffset) OVERRIDE;
|
| virtual void finishAllRendering() OVERRIDE;
|
| virtual bool isStarted() const OVERRIDE;
|
| virtual bool initializeOutputSurface() OVERRIDE;
|
| @@ -126,6 +127,8 @@ private:
|
| void beginFrameAbortedOnImplThread();
|
| void requestReadbackOnImplThread(ReadbackRequest*);
|
| void requestStartPageScaleAnimationOnImplThread(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration);
|
| + void requestProgrammaticScroll(gfx::Vector2d targetOffset);
|
| +
|
| void finishAllRenderingOnImplThread(CompletionEvent*);
|
| void initializeImplOnImplThread(CompletionEvent*, InputHandler*);
|
| void setSurfaceReadyOnImplThread();
|
|
|