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

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

Issue 549323002: BrowserPlugin: Interstitial Pages work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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/blink/web_layer_impl.h" 7 #include "cc/blink/web_layer_impl.h"
8 #include "cc/layers/delegated_frame_provider.h" 8 #include "cc/layers/delegated_frame_provider.h"
9 #include "cc/layers/delegated_frame_resource_collection.h" 9 #include "cc/layers/delegated_frame_resource_collection.h"
10 #include "cc/layers/delegated_renderer_layer.h" 10 #include "cc/layers/delegated_renderer_layer.h"
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 resource_collection_->SetClient(this); 484 resource_collection_->SetClient(this);
485 } 485 }
486 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) { 486 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) {
487 frame_provider_ = new cc::DelegatedFrameProvider( 487 frame_provider_ = new cc::DelegatedFrameProvider(
488 resource_collection_.get(), frame->delegated_frame_data.Pass()); 488 resource_collection_.get(), frame->delegated_frame_data.Pass());
489 if (delegated_layer_.get()) 489 if (delegated_layer_.get())
490 delegated_layer_->RemoveFromParent(); 490 delegated_layer_->RemoveFromParent();
491 delegated_layer_ = 491 delegated_layer_ =
492 cc::DelegatedRendererLayer::Create(frame_provider_.get()); 492 cc::DelegatedRendererLayer::Create(frame_provider_.get());
493 delegated_layer_->SetIsDrawable(true); 493 delegated_layer_->SetIsDrawable(true);
494 buffer_size_ = gfx::Size();
494 SetContentsOpaque(opaque_); 495 SetContentsOpaque(opaque_);
495 background_layer_->AddChild(delegated_layer_); 496 background_layer_->AddChild(delegated_layer_);
496 } else { 497 } else {
497 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass()); 498 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass());
498 } 499 }
499 500
500 CheckSizeAndAdjustLayerProperties( 501 CheckSizeAndAdjustLayerProperties(
501 frame_data->render_pass_list.back()->output_rect.size(), 502 frame_data->render_pass_list.back()->output_rect.size(),
502 frame->metadata.device_scale_factor, 503 frame->metadata.device_scale_factor,
503 delegated_layer_.get()); 504 delegated_layer_.get());
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 dest_size.height()); 559 dest_size.height());
559 } 560 }
560 if (GetBrowserPluginManager()) { 561 if (GetBrowserPluginManager()) {
561 GetBrowserPluginManager()->Send( 562 GetBrowserPluginManager()->Send(
562 new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck( 563 new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
563 host_routing_id_, GetInstanceID(), request_id, resized_bitmap)); 564 host_routing_id_, GetInstanceID(), request_id, resized_bitmap));
564 } 565 }
565 } 566 }
566 567
567 } // namespace content 568 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698