diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/cc/trees/proxy_main.h | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/trees/proxy_main.h')
| -rw-r--r-- | chromium/cc/trees/proxy_main.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/cc/trees/proxy_main.h b/chromium/cc/trees/proxy_main.h index 3d97276193a..e4ab354345e 100644 --- a/chromium/cc/trees/proxy_main.h +++ b/chromium/cc/trees/proxy_main.h @@ -42,6 +42,7 @@ class CC_EXPORT ProxyMain : public Proxy { void DidReceiveCompositorFrameAck(); void BeginMainFrameNotExpectedSoon(); + void BeginMainFrameNotExpectedUntil(base::TimeTicks time); void DidCommitAndDrawFrame(); void SetAnimationEvents(std::unique_ptr<MutatorEvents> events); void DidLoseCompositorFrameSink(); @@ -129,6 +130,10 @@ class CC_EXPORT ProxyMain : public Proxy { // run before we destroy it on the impl thread. std::unique_ptr<ProxyImpl> proxy_impl_; + // WeakPtrs generated by this factory will be invalidated when + // CompositorFrameSink is released. + base::WeakPtrFactory<ProxyMain> frame_sink_bound_weak_factory_; + base::WeakPtrFactory<ProxyMain> weak_factory_; DISALLOW_COPY_AND_ASSIGN(ProxyMain); |