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

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

Issue 801173002: Fix message routing for BrowserPlugin in iframe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests that don't have a RenderThreadImpl Created 6 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 browser_plugin_(browser_plugin), 60 browser_plugin_(browser_plugin),
61 render_frame_proxy_(render_frame_proxy), 61 render_frame_proxy_(render_frame_proxy),
62 frame_(frame) {} 62 frame_(frame) {}
63 63
64 ChildFrameCompositingHelper::~ChildFrameCompositingHelper() {} 64 ChildFrameCompositingHelper::~ChildFrameCompositingHelper() {}
65 65
66 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() { 66 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() {
67 if (!browser_plugin_) 67 if (!browser_plugin_)
68 return NULL; 68 return NULL;
69 69
70 return browser_plugin_->browser_plugin_manager(); 70 return BrowserPluginManager::Get();
71 } 71 }
72 72
73 blink::WebPluginContainer* ChildFrameCompositingHelper::GetContainer() { 73 blink::WebPluginContainer* ChildFrameCompositingHelper::GetContainer() {
74 if (!browser_plugin_) 74 if (!browser_plugin_)
75 return NULL; 75 return NULL;
76 76
77 return browser_plugin_->container(); 77 return browser_plugin_->container();
78 } 78 }
79 79
80 int ChildFrameCompositingHelper::GetInstanceID() { 80 int ChildFrameCompositingHelper::GetInstanceID() {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 SendReclaimCompositorResourcesToBrowser(params); 280 SendReclaimCompositorResourcesToBrowser(params);
281 } 281 }
282 282
283 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) { 283 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) {
284 opaque_ = opaque; 284 opaque_ = opaque;
285 if (delegated_layer_.get()) 285 if (delegated_layer_.get())
286 delegated_layer_->SetContentsOpaque(opaque_); 286 delegated_layer_->SetContentsOpaque(opaque_);
287 } 287 }
288 288
289 } // namespace content 289 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_manager.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698