| Index: cc/blimp/layer_tree_host_remote.h
|
| diff --git a/cc/blimp/layer_tree_host_remote.h b/cc/blimp/layer_tree_host_remote.h
|
| index 5ce5f1698e94e8525f1a1e43da8380a4ed9d6caa..e4ebc7cb6f0ad01221c168baa5c77b1b385bc157 100644
|
| --- a/cc/blimp/layer_tree_host_remote.h
|
| +++ b/cc/blimp/layer_tree_host_remote.h
|
| @@ -112,6 +112,9 @@ class CC_EXPORT LayerTreeHostRemote : public LayerTreeHost,
|
|
|
| // RemoteCompositorBridgeClient implementation.
|
| void BeginMainFrame() override;
|
| + bool ApplyScrollAndScaleUpdateFromClient(
|
| + const ScrollOffsetMap& client_scroll_map,
|
| + float client_page_scale) override;
|
|
|
| private:
|
| enum class FramePipelineStage { NONE, ANIMATE, UPDATE_LAYERS, COMMIT };
|
| @@ -126,6 +129,12 @@ class CC_EXPORT LayerTreeHostRemote : public LayerTreeHost,
|
| bool visible_ = false;
|
| bool defer_commits_ = false;
|
|
|
| + // In threaded/single-threaded mode, the LayerTree and Layers expect scroll/
|
| + // scale updates to come from the impl thread only during the main frame.
|
| + // Since we synchronize state outside of that, this is set so we can
|
| + // temporarily report that a commit is in progress.
|
| + bool synchronizing_client_updates_ = false;
|
| +
|
| // Set to true if a main frame request is pending on the
|
| // RemoteCompositorBridge.
|
| bool main_frame_requested_from_bridge_ = false;
|
|
|