Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 93463002: cc: Remove DelegatingRendererLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: corrected crbug number Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 resource_collection_ = new cc::DelegatedFrameResourceCollection; 686 resource_collection_ = new cc::DelegatedFrameResourceCollection;
687 resource_collection_->SetClient(this); 687 resource_collection_->SetClient(this);
688 } 688 }
689 if (!frame_provider_ || 689 if (!frame_provider_ ||
690 texture_size_in_layer_ != frame_provider_->frame_size()) { 690 texture_size_in_layer_ != frame_provider_->frame_size()) {
691 if (are_layers_attached_) 691 if (are_layers_attached_)
692 RemoveLayers(); 692 RemoveLayers();
693 frame_provider_ = new cc::DelegatedFrameProvider( 693 frame_provider_ = new cc::DelegatedFrameProvider(
694 resource_collection_.get(), frame_data.Pass()); 694 resource_collection_.get(), frame_data.Pass());
695 delegated_renderer_layer_ = 695 delegated_renderer_layer_ =
696 cc::DelegatedRendererLayer::Create(NULL, frame_provider_); 696 cc::DelegatedRendererLayer::Create(frame_provider_);
697 layer_ = delegated_renderer_layer_; 697 layer_ = delegated_renderer_layer_;
698 if (are_layers_attached_) 698 if (are_layers_attached_)
699 AttachLayers(); 699 AttachLayers();
700 } else { 700 } else {
701 frame_provider_->SetFrameData(frame_data.Pass()); 701 frame_provider_->SetFrameData(frame_data.Pass());
702 } 702 }
703 } 703 }
704 704
705 if (delegated_renderer_layer_.get()) { 705 if (delegated_renderer_layer_.get()) {
706 delegated_renderer_layer_->SetDisplaySize(texture_size_in_layer_); 706 delegated_renderer_layer_->SetDisplaySize(texture_size_in_layer_);
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 // RenderWidgetHostView, public: 1380 // RenderWidgetHostView, public:
1381 1381
1382 // static 1382 // static
1383 RenderWidgetHostView* 1383 RenderWidgetHostView*
1384 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { 1384 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
1385 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); 1385 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
1386 return new RenderWidgetHostViewAndroid(rwhi, NULL); 1386 return new RenderWidgetHostViewAndroid(rwhi, NULL);
1387 } 1387 }
1388 1388
1389 } // namespace content 1389 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698