summaryrefslogtreecommitdiffstats
path: root/cc/trees
diff options
context:
space:
mode:
Diffstat (limited to 'cc/trees')
-rw-r--r--cc/trees/channel_main.h1
-rw-r--r--cc/trees/layer_tree_host.cc4
-rw-r--r--cc/trees/layer_tree_host.h2
-rw-r--r--cc/trees/proxy.h2
-rw-r--r--cc/trees/proxy_impl.cc7
-rw-r--r--cc/trees/proxy_impl.h1
-rw-r--r--cc/trees/proxy_main.cc6
-rw-r--r--cc/trees/proxy_main.h1
-rw-r--r--cc/trees/remote_channel_impl.cc4
-rw-r--r--cc/trees/remote_channel_impl.h1
-rw-r--r--cc/trees/remote_channel_main.cc2
-rw-r--r--cc/trees/remote_channel_main.h1
-rw-r--r--cc/trees/single_thread_proxy.cc8
-rw-r--r--cc/trees/single_thread_proxy.h1
-rw-r--r--cc/trees/threaded_channel.cc7
-rw-r--r--cc/trees/threaded_channel.h1
-rw-r--r--cc/trees/threaded_channel_unittest.cc16
17 files changed, 0 insertions, 65 deletions
diff --git a/cc/trees/channel_main.h b/cc/trees/channel_main.h
index 39861e0..277507f 100644
--- a/cc/trees/channel_main.h
+++ b/cc/trees/channel_main.h
@@ -30,7 +30,6 @@ class CC_EXPORT ChannelMain {
virtual ~ChannelMain() {}
// Interface for commands sent to ProxyImpl
- virtual void SetThrottleFrameProductionOnImpl(bool throttle) = 0;
virtual void UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate) = 0;
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index d5f9b58..6e9d689 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -812,10 +812,6 @@ void LayerTreeHost::SetVisible(bool visible) {
proxy_->SetVisible(visible);
}
-void LayerTreeHost::SetThrottleFrameProduction(bool throttle) {
- proxy_->SetThrottleFrameProduction(throttle);
-}
-
void LayerTreeHost::StartPageScaleAnimation(const gfx::Vector2d& target_offset,
bool use_anchor,
float scale,
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index c985002..056326b 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -272,8 +272,6 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
void SetVisible(bool visible);
bool visible() const { return visible_; }
- void SetThrottleFrameProduction(bool throttle);
-
void StartPageScaleAnimation(const gfx::Vector2d& target_offset,
bool use_anchor,
float scale,
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
index f4d7bec..cb7152d 100644
--- a/cc/trees/proxy.h
+++ b/cc/trees/proxy.h
@@ -48,8 +48,6 @@ class CC_EXPORT Proxy {
virtual void SetVisible(bool visible) = 0;
- virtual void SetThrottleFrameProduction(bool throttle) = 0;
-
virtual const RendererCapabilities& GetRendererCapabilities() const = 0;
virtual void SetNeedsAnimate() = 0;
diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc
index 46df9ec..3f5a01e 100644
--- a/cc/trees/proxy_impl.cc
+++ b/cc/trees/proxy_impl.cc
@@ -106,13 +106,6 @@ ProxyImpl::~ProxyImpl() {
smoothness_priority_expiration_notifier_.Shutdown();
}
-void ProxyImpl::SetThrottleFrameProductionOnImpl(bool throttle) {
- TRACE_EVENT1("cc", "ProxyImpl::SetThrottleFrameProductionOnImplThread",
- "throttle", throttle);
- DCHECK(IsImplThread());
- scheduler_->SetThrottleFrameProduction(throttle);
-}
-
void ProxyImpl::UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate) {
diff --git a/cc/trees/proxy_impl.h b/cc/trees/proxy_impl.h
index 3839904..0d96643 100644
--- a/cc/trees/proxy_impl.h
+++ b/cc/trees/proxy_impl.h
@@ -31,7 +31,6 @@ class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient),
~ProxyImpl() override;
// Virtual for testing.
- virtual void SetThrottleFrameProductionOnImpl(bool throttle);
virtual void UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate);
diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
index 4c3d4a4..63bac73 100644
--- a/cc/trees/proxy_main.cc
+++ b/cc/trees/proxy_main.cc
@@ -289,12 +289,6 @@ void ProxyMain::SetVisible(bool visible) {
channel_main_->SetVisibleOnImpl(visible);
}
-void ProxyMain::SetThrottleFrameProduction(bool throttle) {
- TRACE_EVENT1("cc", "ProxyMain::SetThrottleFrameProduction", "throttle",
- throttle);
- channel_main_->SetThrottleFrameProductionOnImpl(throttle);
-}
-
const RendererCapabilities& ProxyMain::GetRendererCapabilities() const {
DCHECK(IsMainThread());
DCHECK(!layer_tree_host_->output_surface_lost());
diff --git a/cc/trees/proxy_main.h b/cc/trees/proxy_main.h
index 63f6994..560d26b 100644
--- a/cc/trees/proxy_main.h
+++ b/cc/trees/proxy_main.h
@@ -92,7 +92,6 @@ class CC_EXPORT ProxyMain : public Proxy {
bool CommitToActiveTree() const override;
void SetOutputSurface(OutputSurface* output_surface) override;
void SetVisible(bool visible) override;
- void SetThrottleFrameProduction(bool throttle) override;
const RendererCapabilities& GetRendererCapabilities() const override;
void SetNeedsAnimate() override;
void SetNeedsUpdateLayers() override;
diff --git a/cc/trees/remote_channel_impl.cc b/cc/trees/remote_channel_impl.cc
index cc43659..4708c1e 100644
--- a/cc/trees/remote_channel_impl.cc
+++ b/cc/trees/remote_channel_impl.cc
@@ -191,10 +191,6 @@ void RemoteChannelImpl::SetVisible(bool visible) {
base::Bind(&ProxyImpl::SetVisibleOnImpl, proxy_impl_weak_ptr_, visible));
}
-void RemoteChannelImpl::SetThrottleFrameProduction(bool throttle) {
- NOTREACHED() << "Should not be called on the remote client LayerTreeHost";
-}
-
const RendererCapabilities& RemoteChannelImpl::GetRendererCapabilities() const {
NOTREACHED() << "Should not be called on the remote client LayerTreeHost";
return main().renderer_capabilities;
diff --git a/cc/trees/remote_channel_impl.h b/cc/trees/remote_channel_impl.h
index cfd411b..79e19ec 100644
--- a/cc/trees/remote_channel_impl.h
+++ b/cc/trees/remote_channel_impl.h
@@ -143,7 +143,6 @@ class CC_EXPORT RemoteChannelImpl : public ChannelImpl,
void SetOutputSurface(OutputSurface* output_surface) override;
void ReleaseOutputSurface() override;
void SetVisible(bool visible) override;
- void SetThrottleFrameProduction(bool throttle) override;
const RendererCapabilities& GetRendererCapabilities() const override;
void SetNeedsAnimate() override;
void SetNeedsUpdateLayers() override;
diff --git a/cc/trees/remote_channel_main.cc b/cc/trees/remote_channel_main.cc
index c8d304f..3aea001 100644
--- a/cc/trees/remote_channel_main.cc
+++ b/cc/trees/remote_channel_main.cc
@@ -53,8 +53,6 @@ void RemoteChannelMain::OnProtoReceived(
HandleProto(proto->to_main());
}
-void RemoteChannelMain::SetThrottleFrameProductionOnImpl(bool throttle) {}
-
void RemoteChannelMain::UpdateTopControlsStateOnImpl(
TopControlsState constraints,
TopControlsState current,
diff --git a/cc/trees/remote_channel_main.h b/cc/trees/remote_channel_main.h
index 23c2cdc..7b2b9c7 100644
--- a/cc/trees/remote_channel_main.h
+++ b/cc/trees/remote_channel_main.h
@@ -30,7 +30,6 @@ class CC_EXPORT RemoteChannelMain : public ChannelMain,
~RemoteChannelMain() override;
// ChannelMain implementation
- void SetThrottleFrameProductionOnImpl(bool throttle) override;
void UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate) override;
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 74b59c1..2735029 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -118,14 +118,6 @@ void SingleThreadProxy::SetVisible(bool visible) {
scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible());
}
-void SingleThreadProxy::SetThrottleFrameProduction(bool throttle) {
- TRACE_EVENT1("cc", "SingleThreadProxy::SetThrottleFrameProduction",
- "throttle", throttle);
- DebugScopedSetImplThread impl(task_runner_provider_);
- if (scheduler_on_impl_thread_)
- scheduler_on_impl_thread_->SetThrottleFrameProduction(throttle);
-}
-
void SingleThreadProxy::RequestNewOutputSurface() {
DCHECK(task_runner_provider_->IsMainThread());
DCHECK(layer_tree_host_->output_surface_lost());
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 099c223..3b69668 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -41,7 +41,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
void SetOutputSurface(OutputSurface* output_surface) override;
void ReleaseOutputSurface() override;
void SetVisible(bool visible) override;
- void SetThrottleFrameProduction(bool throttle) override;
const RendererCapabilities& GetRendererCapabilities() const override;
void SetNeedsAnimate() override;
void SetNeedsUpdateLayers() override;
diff --git a/cc/trees/threaded_channel.cc b/cc/trees/threaded_channel.cc
index 77e60ff..7d1d728 100644
--- a/cc/trees/threaded_channel.cc
+++ b/cc/trees/threaded_channel.cc
@@ -34,13 +34,6 @@ ThreadedChannel::~ThreadedChannel() {
DCHECK(!IsInitialized());
}
-void ThreadedChannel::SetThrottleFrameProductionOnImpl(bool throttle) {
- DCHECK(IsMainThread());
- ImplThreadTaskRunner()->PostTask(
- FROM_HERE, base::Bind(&ProxyImpl::SetThrottleFrameProductionOnImpl,
- proxy_impl_weak_ptr_, throttle));
-}
-
void ThreadedChannel::UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate) {
diff --git a/cc/trees/threaded_channel.h b/cc/trees/threaded_channel.h
index ab20e52..2a669d4 100644
--- a/cc/trees/threaded_channel.h
+++ b/cc/trees/threaded_channel.h
@@ -83,7 +83,6 @@ class CC_EXPORT ThreadedChannel : public ChannelMain, public ChannelImpl {
~ThreadedChannel() override;
// ChannelMain Implementation
- void SetThrottleFrameProductionOnImpl(bool throttle) override;
void UpdateTopControlsStateOnImpl(TopControlsState constraints,
TopControlsState current,
bool animate) override;
diff --git a/cc/trees/threaded_channel_unittest.cc b/cc/trees/threaded_channel_unittest.cc
index 79d1c65..81d28de 100644
--- a/cc/trees/threaded_channel_unittest.cc
+++ b/cc/trees/threaded_channel_unittest.cc
@@ -73,22 +73,6 @@ class ThreadedChannelTestInitializationAndShutdown
MULTI_THREAD_DIRECT_RENDERER_TEST_F(
ThreadedChannelTestInitializationAndShutdown);
-class ThreadedChannelTestThrottleFrameProduction : public ThreadedChannelTest {
- void BeginChannelTest() override {
- proxy()->SetThrottleFrameProduction(true);
- }
-
- void SetThrottleFrameProductionOnImpl(bool throttle) override {
- ASSERT_TRUE(throttle);
- calls_received_++;
- EndTest();
- }
-
- void AfterTest() override { EXPECT_EQ(1, calls_received_); }
-};
-
-MULTI_THREAD_DIRECT_RENDERER_TEST_F(ThreadedChannelTestThrottleFrameProduction);
-
class ThreadedChannelTestTopControlsState : public ThreadedChannelTest {
void BeginChannelTest() override {
proxy()->UpdateTopControlsState(TopControlsState::BOTH,
generated by cgit v1.1 at 2024-05-26 22:02:41 +0000