| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index 848cba360da47beee81f6f221f262ff28786ab98..ca0ad027a9b414c7f5889767a640d3a5f674e05a 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -13,7 +13,6 @@
|
| #include "cc/output/output_surface.h"
|
| #include "cc/quads/draw_quad.h"
|
| #include "cc/resources/prioritized_resource_manager.h"
|
| -#include "cc/resources/resource_update_controller.h"
|
| #include "cc/scheduler/commit_earlyout_reason.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| #include "cc/trees/layer_tree_host_single_thread_client.h"
|
| @@ -244,25 +243,6 @@ void SingleThreadProxy::DoCommit() {
|
|
|
| // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
|
| // is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile4(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "461509 SingleThreadProxy::DoCommit4"));
|
| - scoped_ptr<ResourceUpdateController> update_controller =
|
| - ResourceUpdateController::Create(
|
| - NULL,
|
| - MainThreadTaskRunner(),
|
| - queue_for_commit_.Pass(),
|
| - layer_tree_host_impl_->resource_provider());
|
| -
|
| - // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
|
| - // is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile5(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "461509 SingleThreadProxy::DoCommit5"));
|
| - update_controller->Finalize();
|
| -
|
| - // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
|
| - // is fixed.
|
| tracked_objects::ScopedTracker tracking_profile6(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "461509 SingleThreadProxy::DoCommit6"));
|
| @@ -381,10 +361,6 @@ bool SingleThreadProxy::BeginMainFrameRequested() const {
|
| return commit_requested_;
|
| }
|
|
|
| -size_t SingleThreadProxy::MaxPartialTextureUpdates() const {
|
| - return std::numeric_limits<size_t>::max();
|
| -}
|
| -
|
| void SingleThreadProxy::Stop() {
|
| TRACE_EVENT0("cc", "SingleThreadProxy::stop");
|
| DCHECK(Proxy::IsMainThread());
|
| @@ -858,9 +834,6 @@ void SingleThreadProxy::DoBeginMainFrame(
|
| layer_tree_host_->AnimateLayers(begin_frame_args.frame_time);
|
| layer_tree_host_->Layout();
|
|
|
| - DCHECK(!queue_for_commit_);
|
| - queue_for_commit_ = make_scoped_ptr(new ResourceUpdateQueue);
|
| -
|
| // New commits requested inside UpdateLayers should be respected.
|
| commit_requested_ = false;
|
|
|
| @@ -939,9 +912,6 @@ void SingleThreadProxy::ScheduledActionInvalidateOutputSurface() {
|
| NOTREACHED();
|
| }
|
|
|
| -void SingleThreadProxy::DidAnticipatedDrawTimeChange(base::TimeTicks time) {
|
| -}
|
| -
|
| base::TimeDelta SingleThreadProxy::DrawDurationEstimate() {
|
| return timing_history_.DrawDurationEstimate();
|
| }
|
|
|