summaryrefslogtreecommitdiff
path: root/chromium/cc/trees/proxy_main.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-01 12:59:39 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:40:43 +0000
commit28b1110370900897ab652cb420c371fab8857ad4 (patch)
tree41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/cc/trees/proxy_main.h
parent399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff)
downloadqtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/trees/proxy_main.h')
-rw-r--r--chromium/cc/trees/proxy_main.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/cc/trees/proxy_main.h b/chromium/cc/trees/proxy_main.h
index ab465610805..f40fe89c9e1 100644
--- a/chromium/cc/trees/proxy_main.h
+++ b/chromium/cc/trees/proxy_main.h
@@ -21,6 +21,7 @@ class AnimationEvents;
class BeginFrameSource;
class ChannelMain;
class LayerTreeHost;
+class LayerTreeMutator;
// This class aggregates all interactions that the impl side of the compositor
// needs to have with the main side.
@@ -103,6 +104,7 @@ class CC_EXPORT ProxyMain : public Proxy {
std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
void Stop() override;
bool SupportsImplScrolling() const override;
+ void SetMutator(std::unique_ptr<LayerTreeMutator> mutator) override;
bool MainFrameWillHappenForTesting() override;
void ReleaseOutputSurface() override;
void UpdateTopControlsState(TopControlsState constraints,