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

Side by Side Diff: content/renderer/child_frame_compositing_helper.cc

Issue 241223002: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Commits the right URL now. Created 6 years, 6 months 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/child_frame_compositing_helper.h" 5 #include "content/renderer/child_frame_compositing_helper.h"
6 6
7 #include "cc/layers/delegated_frame_provider.h" 7 #include "cc/layers/delegated_frame_provider.h"
8 #include "cc/layers/delegated_frame_resource_collection.h" 8 #include "cc/layers/delegated_frame_resource_collection.h"
9 #include "cc/layers/delegated_renderer_layer.h" 9 #include "cc/layers/delegated_renderer_layer.h"
10 #include "cc/layers/solid_color_layer.h" 10 #include "cc/layers/solid_color_layer.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 SendCompositorFrameSwappedACKToBrowser(params); 180 SendCompositorFrameSwappedACKToBrowser(params);
181 181
182 ack_pending_ = false; 182 ack_pending_ = false;
183 } 183 }
184 184
185 void ChildFrameCompositingHelper::EnableCompositing(bool enable) { 185 void ChildFrameCompositingHelper::EnableCompositing(bool enable) {
186 if (enable && !background_layer_.get()) { 186 if (enable && !background_layer_.get()) {
187 background_layer_ = cc::SolidColorLayer::Create(); 187 background_layer_ = cc::SolidColorLayer::Create();
188 background_layer_->SetMasksToBounds(true); 188 background_layer_->SetMasksToBounds(true);
189 background_layer_->SetBackgroundColor( 189 background_layer_->SetBackgroundColor(
190 SkColorSetARGBInline(255, 255, 255, 255)); 190 SkColorSetARGBInline(255, 0, 0, 255));
ncarter (slow) 2014/06/25 01:07:56 A+++ would change again excellent color shipped on
191 web_layer_.reset(new WebLayerImpl(background_layer_)); 191 web_layer_.reset(new WebLayerImpl(background_layer_));
192 } 192 }
193 193
194 if (GetContainer()) { 194 if (GetContainer()) {
195 GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL); 195 GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL);
196 } else if (frame_) { 196 } else if (frame_) {
197 frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL); 197 frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL);
198 } 198 }
199 } 199 }
200 200
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 dest_size.height()); 559 dest_size.height());
560 } 560 }
561 if (GetBrowserPluginManager()) { 561 if (GetBrowserPluginManager()) {
562 GetBrowserPluginManager()->Send( 562 GetBrowserPluginManager()->Send(
563 new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck( 563 new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
564 host_routing_id_, GetInstanceID(), request_id, resized_bitmap)); 564 host_routing_id_, GetInstanceID(), request_id, resized_bitmap));
565 } 565 }
566 } 566 }
567 567
568 } // namespace content 568 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698