| Index: cc/trees/proxy_main.cc
|
| diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
|
| index 04de28097a497ecacf39444e8f1d9bef3f04c1ee..9f3a1add77240eca8a87a262e243dd6a36c1b71b 100644
|
| --- a/cc/trees/proxy_main.cc
|
| +++ b/cc/trees/proxy_main.cc
|
| @@ -76,12 +76,6 @@ void ProxyMain::DidCompleteSwapBuffers() {
|
| layer_tree_host_->DidCompleteSwapBuffers();
|
| }
|
|
|
| -void ProxyMain::SetRendererCapabilities(
|
| - const RendererCapabilities& capabilities) {
|
| - DCHECK(IsMainThread());
|
| - renderer_capabilities_ = capabilities;
|
| -}
|
| -
|
| void ProxyMain::BeginMainFrameNotExpectedSoon() {
|
| TRACE_EVENT0("cc", "ProxyMain::BeginMainFrameNotExpectedSoon");
|
| DCHECK(IsMainThread());
|
| @@ -111,18 +105,14 @@ void ProxyMain::RequestNewOutputSurface() {
|
| layer_tree_host_->RequestNewOutputSurface();
|
| }
|
|
|
| -void ProxyMain::DidInitializeOutputSurface(
|
| - bool success,
|
| - const RendererCapabilities& capabilities) {
|
| +void ProxyMain::DidInitializeOutputSurface(bool success) {
|
| TRACE_EVENT0("cc", "ProxyMain::DidInitializeOutputSurface");
|
| DCHECK(IsMainThread());
|
|
|
| - if (!success) {
|
| + if (!success)
|
| layer_tree_host_->DidFailToInitializeOutputSurface();
|
| - return;
|
| - }
|
| - renderer_capabilities_ = capabilities;
|
| - layer_tree_host_->DidInitializeOutputSurface();
|
| + else
|
| + layer_tree_host_->DidInitializeOutputSurface();
|
| }
|
|
|
| void ProxyMain::DidCompletePageScaleAnimation() {
|
| @@ -280,12 +270,6 @@ void ProxyMain::SetVisible(bool visible) {
|
| channel_main_->SetVisibleOnImpl(visible);
|
| }
|
|
|
| -const RendererCapabilities& ProxyMain::GetRendererCapabilities() const {
|
| - DCHECK(IsMainThread());
|
| - DCHECK(!layer_tree_host_->output_surface_lost());
|
| - return renderer_capabilities_;
|
| -}
|
| -
|
| void ProxyMain::SetNeedsAnimate() {
|
| DCHECK(IsMainThread());
|
| if (SendCommitRequestToImplThreadIfNeeded(ANIMATE_PIPELINE_STAGE)) {
|
|
|