Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| 11 #include "cc/layers/solid_color_layer.h" | 11 #include "cc/layers/solid_color_layer.h" |
| 12 #include "cc/layers/surface_layer.h" | |
| 12 #include "cc/output/context_provider.h" | 13 #include "cc/output/context_provider.h" |
| 13 #include "cc/output/copy_output_request.h" | 14 #include "cc/output/copy_output_request.h" |
| 14 #include "cc/output/copy_output_result.h" | 15 #include "cc/output/copy_output_result.h" |
| 15 #include "cc/resources/single_release_callback.h" | 16 #include "cc/resources/single_release_callback.h" |
| 16 #include "content/common/browser_plugin/browser_plugin_messages.h" | 17 #include "content/common/browser_plugin/browser_plugin_messages.h" |
| 17 #include "content/common/frame_messages.h" | 18 #include "content/common/frame_messages.h" |
| 18 #include "content/common/gpu/client/context_provider_command_buffer.h" | 19 #include "content/common/gpu/client/context_provider_command_buffer.h" |
| 19 #include "content/renderer/browser_plugin/browser_plugin.h" | 20 #include "content/renderer/browser_plugin/browser_plugin.h" |
| 20 #include "content/renderer/browser_plugin/browser_plugin_manager.h" | 21 #include "content/renderer/browser_plugin/browser_plugin_manager.h" |
| 21 #include "content/renderer/render_frame_impl.h" | 22 #include "content/renderer/render_frame_impl.h" |
| 22 #include "content/renderer/render_frame_proxy.h" | 23 #include "content/renderer/render_frame_proxy.h" |
| 23 #include "content/renderer/render_thread_impl.h" | 24 #include "content/renderer/render_thread_impl.h" |
| 24 #include "skia/ext/image_operations.h" | 25 #include "skia/ext/image_operations.h" |
| 25 #include "third_party/WebKit/public/web/WebFrame.h" | 26 #include "third_party/WebKit/public/web/WebFrame.h" |
| 26 #include "third_party/WebKit/public/web/WebPluginContainer.h" | 27 #include "third_party/WebKit/public/web/WebPluginContainer.h" |
| 27 #include "third_party/khronos/GLES2/gl2.h" | 28 #include "third_party/khronos/GLES2/gl2.h" |
| 28 #include "ui/gfx/geometry/size_conversions.h" | 29 #include "ui/gfx/geometry/size_conversions.h" |
| 29 #include "ui/gfx/skia_util.h" | 30 #include "ui/gfx/skia_util.h" |
| 30 | 31 |
| 31 namespace content { | 32 namespace content { |
| 32 | 33 |
| 33 ChildFrameCompositingHelper* | 34 ChildFrameCompositingHelper* |
| 34 ChildFrameCompositingHelper::CreateForBrowserPlugin( | 35 ChildFrameCompositingHelper::CreateForBrowserPlugin( |
| 35 const base::WeakPtr<BrowserPlugin>& browser_plugin) { | 36 const base::WeakPtr<BrowserPlugin>& browser_plugin) { |
| 36 return new ChildFrameCompositingHelper( | 37 return new ChildFrameCompositingHelper( |
| 37 browser_plugin, NULL, NULL, browser_plugin->render_frame_routing_id()); | 38 browser_plugin, nullptr, nullptr, |
| 39 browser_plugin->render_frame_routing_id()); | |
| 38 } | 40 } |
| 39 | 41 |
| 40 ChildFrameCompositingHelper* | 42 ChildFrameCompositingHelper* |
| 41 ChildFrameCompositingHelper::CreateForRenderFrameProxy( | 43 ChildFrameCompositingHelper::CreateForRenderFrameProxy( |
| 42 RenderFrameProxy* render_frame_proxy) { | 44 RenderFrameProxy* render_frame_proxy) { |
| 43 return new ChildFrameCompositingHelper(base::WeakPtr<BrowserPlugin>(), | 45 return new ChildFrameCompositingHelper(base::WeakPtr<BrowserPlugin>(), |
| 44 render_frame_proxy->web_frame(), | 46 render_frame_proxy->web_frame(), |
| 45 render_frame_proxy, | 47 render_frame_proxy, |
| 46 render_frame_proxy->routing_id()); | 48 render_frame_proxy->routing_id()); |
| 47 } | 49 } |
| 48 | 50 |
| 49 ChildFrameCompositingHelper::ChildFrameCompositingHelper( | 51 ChildFrameCompositingHelper::ChildFrameCompositingHelper( |
| 50 const base::WeakPtr<BrowserPlugin>& browser_plugin, | 52 const base::WeakPtr<BrowserPlugin>& browser_plugin, |
| 51 blink::WebFrame* frame, | 53 blink::WebFrame* frame, |
| 52 RenderFrameProxy* render_frame_proxy, | 54 RenderFrameProxy* render_frame_proxy, |
| 53 int host_routing_id) | 55 int host_routing_id) |
| 54 : host_routing_id_(host_routing_id), | 56 : host_routing_id_(host_routing_id), |
| 55 last_route_id_(0), | 57 last_route_id_(0), |
| 56 last_output_surface_id_(0), | 58 last_output_surface_id_(0), |
| 57 last_host_id_(0), | 59 last_host_id_(0), |
| 58 ack_pending_(true), | 60 ack_pending_(true), |
| 59 opaque_(true), | 61 opaque_(true), |
| 60 browser_plugin_(browser_plugin), | 62 browser_plugin_(browser_plugin), |
| 61 render_frame_proxy_(render_frame_proxy), | 63 render_frame_proxy_(render_frame_proxy), |
| 62 frame_(frame) {} | 64 frame_(frame) {} |
| 63 | 65 |
| 64 ChildFrameCompositingHelper::~ChildFrameCompositingHelper() { | 66 ChildFrameCompositingHelper::~ChildFrameCompositingHelper() { |
| 65 if (resource_collection_.get()) | 67 if (resource_collection_.get()) |
| 66 resource_collection_->SetClient(NULL); | 68 resource_collection_->SetClient(nullptr); |
|
ncarter (slow)
2015/05/28 22:32:52
We've given pointers to this object to the surface
kenrb
2015/05/29 19:29:37
I changed the arguments to weak pointers, because
| |
| 67 } | 69 } |
| 68 | 70 |
| 69 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() { | 71 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() { |
| 70 if (!browser_plugin_) | 72 if (!browser_plugin_) |
| 71 return NULL; | 73 return nullptr; |
| 72 | 74 |
| 73 return BrowserPluginManager::Get(); | 75 return BrowserPluginManager::Get(); |
| 74 } | 76 } |
| 75 | 77 |
| 76 blink::WebPluginContainer* ChildFrameCompositingHelper::GetContainer() { | 78 blink::WebPluginContainer* ChildFrameCompositingHelper::GetContainer() { |
| 77 if (!browser_plugin_) | 79 if (!browser_plugin_) |
| 78 return NULL; | 80 return nullptr; |
| 79 | 81 |
| 80 return browser_plugin_->container(); | 82 return browser_plugin_->container(); |
| 81 } | 83 } |
| 82 | 84 |
| 83 int ChildFrameCompositingHelper::GetInstanceID() { | 85 int ChildFrameCompositingHelper::GetInstanceID() { |
| 84 if (!browser_plugin_) | 86 if (!browser_plugin_) |
| 85 return 0; | 87 return 0; |
| 86 | 88 |
| 87 return browser_plugin_->browser_plugin_instance_id(); | 89 return browser_plugin_->browser_plugin_instance_id(); |
| 88 } | 90 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 if (enable && !background_layer_.get()) { | 137 if (enable && !background_layer_.get()) { |
| 136 background_layer_ = | 138 background_layer_ = |
| 137 cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings()); | 139 cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings()); |
| 138 background_layer_->SetMasksToBounds(true); | 140 background_layer_->SetMasksToBounds(true); |
| 139 background_layer_->SetBackgroundColor( | 141 background_layer_->SetBackgroundColor( |
| 140 SkColorSetARGBInline(255, 255, 255, 255)); | 142 SkColorSetARGBInline(255, 255, 255, 255)); |
| 141 web_layer_.reset(new cc_blink::WebLayerImpl(background_layer_)); | 143 web_layer_.reset(new cc_blink::WebLayerImpl(background_layer_)); |
| 142 } | 144 } |
| 143 | 145 |
| 144 if (GetContainer()) { | 146 if (GetContainer()) { |
| 145 GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL); | 147 GetContainer()->setWebLayer(enable ? web_layer_.get() : nullptr); |
| 146 } else if (frame_) { | 148 } else if (frame_) { |
| 147 frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL); | 149 frame_->setRemoteWebLayer(enable ? web_layer_.get() : nullptr); |
| 148 } | 150 } |
| 149 } | 151 } |
| 150 | 152 |
| 151 void ChildFrameCompositingHelper::CheckSizeAndAdjustLayerProperties( | 153 void ChildFrameCompositingHelper::CheckSizeAndAdjustLayerProperties( |
| 152 const gfx::Size& new_size, | 154 const gfx::Size& new_size, |
| 153 float device_scale_factor, | 155 float device_scale_factor, |
| 154 cc::Layer* layer) { | 156 cc::Layer* layer) { |
| 155 if (buffer_size_ != new_size) { | 157 if (buffer_size_ != new_size) { |
| 156 buffer_size_ = new_size; | 158 buffer_size_ = new_size; |
| 157 // The container size is in DIP, so is the layer size. | 159 // The container size is in DIP, so is the layer size. |
| 158 // Buffer size is in physical pixels, so we need to adjust | 160 // Buffer size is in physical pixels, so we need to adjust |
| 159 // it by the device scale factor. | 161 // it by the device scale factor. |
| 160 gfx::Size device_scale_adjusted_size = gfx::ToFlooredSize( | 162 gfx::Size device_scale_adjusted_size = gfx::ToFlooredSize( |
| 161 gfx::ScaleSize(buffer_size_, 1.0f / device_scale_factor)); | 163 gfx::ScaleSize(buffer_size_, 1.0f / device_scale_factor)); |
| 162 layer->SetBounds(device_scale_adjusted_size); | 164 layer->SetBounds(device_scale_adjusted_size); |
| 163 } | 165 } |
| 164 | 166 |
| 165 // Manually manage background layer for transparent webview. | 167 // Manually manage background layer for transparent webview. |
| 166 if (!opaque_) | 168 if (!opaque_) |
| 167 background_layer_->SetIsDrawable(false); | 169 background_layer_->SetIsDrawable(false); |
| 168 } | 170 } |
| 169 | 171 |
| 170 void ChildFrameCompositingHelper::OnContainerDestroy() { | 172 void ChildFrameCompositingHelper::OnContainerDestroy() { |
| 171 // If we have a pending ACK, then ACK now so we don't lose frames in the | 173 // If we have a pending ACK, then ACK now so we don't lose frames in the |
| 172 // future. | 174 // future. |
| 173 DidCommitCompositorFrame(); | 175 DidCommitCompositorFrame(); |
| 174 | 176 |
| 175 if (GetContainer()) | 177 if (GetContainer()) |
| 176 GetContainer()->setWebLayer(NULL); | 178 GetContainer()->setWebLayer(nullptr); |
| 177 | 179 |
| 178 if (resource_collection_.get()) | 180 if (resource_collection_.get()) |
| 179 resource_collection_->SetClient(NULL); | 181 resource_collection_->SetClient(nullptr); |
| 180 | 182 |
| 181 ack_pending_ = false; | 183 ack_pending_ = false; |
| 182 resource_collection_ = NULL; | 184 resource_collection_ = nullptr; |
| 183 frame_provider_ = NULL; | 185 frame_provider_ = nullptr; |
| 184 delegated_layer_ = NULL; | 186 delegated_layer_ = nullptr; |
| 185 background_layer_ = NULL; | 187 background_layer_ = nullptr; |
| 188 surface_layer_ = nullptr; | |
| 186 web_layer_.reset(); | 189 web_layer_.reset(); |
| 187 } | 190 } |
| 188 | 191 |
| 189 void ChildFrameCompositingHelper::ChildFrameGone() { | 192 void ChildFrameCompositingHelper::ChildFrameGone() { |
| 190 background_layer_->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0)); | 193 background_layer_->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0)); |
| 191 background_layer_->RemoveAllChildren(); | 194 background_layer_->RemoveAllChildren(); |
| 192 background_layer_->SetIsDrawable(true); | 195 background_layer_->SetIsDrawable(true); |
| 193 background_layer_->SetContentsOpaque(true); | 196 background_layer_->SetContentsOpaque(true); |
| 194 } | 197 } |
| 195 | 198 |
| 196 void ChildFrameCompositingHelper::OnCompositorFrameSwapped( | 199 void ChildFrameCompositingHelper::OnCompositorFrameSwapped( |
| 197 scoped_ptr<cc::CompositorFrame> frame, | 200 scoped_ptr<cc::CompositorFrame> frame, |
| 198 int route_id, | 201 int route_id, |
| 199 uint32 output_surface_id, | 202 uint32 output_surface_id, |
| 200 int host_id, | 203 int host_id, |
| 201 base::SharedMemoryHandle handle) { | 204 base::SharedMemoryHandle handle) { |
| 202 cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); | 205 cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); |
| 206 | |
| 207 // Surface IDs and compositor frames should never be received | |
| 208 // interchangeably. | |
| 209 DCHECK(!surface_layer_.get()); | |
| 210 | |
| 203 // Do nothing if we are getting destroyed or have no frame data. | 211 // Do nothing if we are getting destroyed or have no frame data. |
| 204 if (!frame_data || !background_layer_.get()) | 212 if (!frame_data || !background_layer_.get()) |
| 205 return; | 213 return; |
| 206 | 214 |
| 207 DCHECK(!frame_data->render_pass_list.empty()); | 215 DCHECK(!frame_data->render_pass_list.empty()); |
| 208 cc::RenderPass* root_pass = frame_data->render_pass_list.back(); | 216 cc::RenderPass* root_pass = frame_data->render_pass_list.back(); |
| 209 gfx::Size frame_size = root_pass->output_rect.size(); | 217 gfx::Size frame_size = root_pass->output_rect.size(); |
| 210 | 218 |
| 211 if (last_route_id_ != route_id || | 219 if (last_route_id_ != route_id || |
| 212 last_output_surface_id_ != output_surface_id || | 220 last_output_surface_id_ != output_surface_id || |
| 213 last_host_id_ != host_id) { | 221 last_host_id_ != host_id) { |
| 214 // Resource ids are scoped by the output surface. | 222 // Resource ids are scoped by the output surface. |
| 215 // If the originating output surface doesn't match the last one, it | 223 // If the originating output surface doesn't match the last one, it |
| 216 // indicates the guest's output surface may have been recreated, in which | 224 // indicates the guest's output surface may have been recreated, in which |
| 217 // case we should recreate the DelegatedRendererLayer, to avoid matching | 225 // case we should recreate the DelegatedRendererLayer, to avoid matching |
| 218 // resources from the old one with resources from the new one which would | 226 // resources from the old one with resources from the new one which would |
| 219 // have the same id. | 227 // have the same id. |
| 220 frame_provider_ = NULL; | 228 frame_provider_ = nullptr; |
| 221 | 229 |
| 222 // Drop the cc::DelegatedFrameResourceCollection so that we will not return | 230 // Drop the cc::DelegatedFrameResourceCollection so that we will not return |
| 223 // any resources from the old output surface with the new output surface id. | 231 // any resources from the old output surface with the new output surface id. |
| 224 if (resource_collection_.get()) { | 232 if (resource_collection_.get()) { |
| 225 resource_collection_->SetClient(NULL); | 233 resource_collection_->SetClient(nullptr); |
| 226 | 234 |
| 227 if (resource_collection_->LoseAllResources()) | 235 if (resource_collection_->LoseAllResources()) |
| 228 SendReturnedDelegatedResources(); | 236 SendReturnedDelegatedResources(); |
| 229 resource_collection_ = NULL; | 237 resource_collection_ = nullptr; |
| 230 } | 238 } |
| 231 last_output_surface_id_ = output_surface_id; | 239 last_output_surface_id_ = output_surface_id; |
| 232 last_route_id_ = route_id; | 240 last_route_id_ = route_id; |
| 233 last_host_id_ = host_id; | 241 last_host_id_ = host_id; |
| 234 } | 242 } |
| 235 if (!resource_collection_.get()) { | 243 if (!resource_collection_.get()) { |
| 236 resource_collection_ = new cc::DelegatedFrameResourceCollection; | 244 resource_collection_ = new cc::DelegatedFrameResourceCollection; |
| 237 resource_collection_->SetClient(this); | 245 resource_collection_->SetClient(this); |
| 238 } | 246 } |
| 239 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) { | 247 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) { |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 252 } | 260 } |
| 253 | 261 |
| 254 CheckSizeAndAdjustLayerProperties( | 262 CheckSizeAndAdjustLayerProperties( |
| 255 frame_data->render_pass_list.back()->output_rect.size(), | 263 frame_data->render_pass_list.back()->output_rect.size(), |
| 256 frame->metadata.device_scale_factor, | 264 frame->metadata.device_scale_factor, |
| 257 delegated_layer_.get()); | 265 delegated_layer_.get()); |
| 258 | 266 |
| 259 ack_pending_ = true; | 267 ack_pending_ = true; |
| 260 } | 268 } |
| 261 | 269 |
| 270 // static | |
| 271 void ChildFrameCompositingHelper::SatisfyCallback( | |
| 272 ChildFrameCompositingHelper* helper, | |
| 273 cc::SurfaceSequence sequence) { | |
| 274 if (helper->render_frame_proxy_) { | |
| 275 helper->render_frame_proxy_->Send( | |
| 276 new FrameHostMsg_SatisfySequence(helper->host_routing_id_, sequence)); | |
| 277 } | |
| 278 } | |
| 279 | |
| 280 // static | |
| 281 void ChildFrameCompositingHelper::RequireCallback( | |
| 282 ChildFrameCompositingHelper* helper, | |
| 283 cc::SurfaceId id, | |
| 284 cc::SurfaceSequence sequence) { | |
| 285 if (helper->render_frame_proxy_) { | |
| 286 helper->render_frame_proxy_->Send(new FrameHostMsg_RequireSequence( | |
| 287 helper->host_routing_id_, id, sequence)); | |
| 288 } | |
| 289 } | |
| 290 | |
| 291 void ChildFrameCompositingHelper::OnSetSurface( | |
| 292 const cc::SurfaceId& surface_id, | |
| 293 const gfx::Size& frame_size, | |
| 294 float scale_factor, | |
| 295 const cc::SurfaceSequence& sequence) { | |
| 296 // Surface IDs and compositor frames should never be received | |
| 297 // interchangably. | |
| 298 DCHECK(!delegated_layer_.get()); | |
| 299 | |
| 300 // Do nothing if we are getting destroyed. | |
| 301 if (!background_layer_.get()) | |
| 302 return; | |
| 303 | |
| 304 if (!surface_layer_.get()) { | |
| 305 cc::SurfaceLayer::SatisfyCallback satisfy_callback = base::Bind( | |
| 306 &ChildFrameCompositingHelper::SatisfyCallback, base::Unretained(this)); | |
| 307 cc::SurfaceLayer::RequireCallback require_callback = base::Bind( | |
| 308 &ChildFrameCompositingHelper::RequireCallback, base::Unretained(this)); | |
| 309 surface_layer_ = | |
| 310 cc::SurfaceLayer::Create(cc_blink::WebLayerImpl::LayerSettings(), | |
| 311 satisfy_callback, require_callback); | |
| 312 } | |
| 313 surface_layer_->SetSurfaceId(surface_id, scale_factor, frame_size); | |
| 314 UpdateVisibility(true); | |
| 315 SetContentsOpaque(opaque_); | |
| 316 background_layer_->AddChild(surface_layer_); | |
| 317 | |
| 318 // The RWHV creates a destruction dependency on the surface that needs to be | |
| 319 // satisfied. | |
| 320 render_frame_proxy_->Send( | |
| 321 new FrameHostMsg_SatisfySequence(host_routing_id_, sequence)); | |
| 322 | |
| 323 CheckSizeAndAdjustLayerProperties(frame_size, scale_factor, | |
| 324 surface_layer_.get()); | |
| 325 } | |
| 326 | |
| 262 void ChildFrameCompositingHelper::UpdateVisibility(bool visible) { | 327 void ChildFrameCompositingHelper::UpdateVisibility(bool visible) { |
| 263 if (delegated_layer_.get()) | 328 if (delegated_layer_.get()) |
| 264 delegated_layer_->SetIsDrawable(visible); | 329 delegated_layer_->SetIsDrawable(visible); |
| 330 if (surface_layer_.get()) | |
| 331 surface_layer_->SetIsDrawable(visible); | |
| 265 } | 332 } |
| 266 | 333 |
| 267 void ChildFrameCompositingHelper::UnusedResourcesAreAvailable() { | 334 void ChildFrameCompositingHelper::UnusedResourcesAreAvailable() { |
| 268 if (ack_pending_) | 335 if (ack_pending_) |
| 269 return; | 336 return; |
| 270 | 337 |
| 271 SendReturnedDelegatedResources(); | 338 SendReturnedDelegatedResources(); |
| 272 } | 339 } |
| 273 | 340 |
| 274 void ChildFrameCompositingHelper::SendReturnedDelegatedResources() { | 341 void ChildFrameCompositingHelper::SendReturnedDelegatedResources() { |
| 275 FrameHostMsg_ReclaimCompositorResources_Params params; | 342 FrameHostMsg_ReclaimCompositorResources_Params params; |
| 276 if (resource_collection_.get()) | 343 if (resource_collection_.get()) |
| 277 resource_collection_->TakeUnusedResourcesForChildCompositor( | 344 resource_collection_->TakeUnusedResourcesForChildCompositor( |
| 278 ¶ms.ack.resources); | 345 ¶ms.ack.resources); |
| 279 DCHECK(!params.ack.resources.empty()); | 346 DCHECK(!params.ack.resources.empty()); |
| 280 | 347 |
| 281 params.route_id = last_route_id_; | 348 params.route_id = last_route_id_; |
| 282 params.output_surface_id = last_output_surface_id_; | 349 params.output_surface_id = last_output_surface_id_; |
| 283 params.renderer_host_id = last_host_id_; | 350 params.renderer_host_id = last_host_id_; |
| 284 SendReclaimCompositorResourcesToBrowser(params); | 351 SendReclaimCompositorResourcesToBrowser(params); |
| 285 } | 352 } |
| 286 | 353 |
| 287 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) { | 354 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) { |
| 288 opaque_ = opaque; | 355 opaque_ = opaque; |
| 289 if (delegated_layer_.get()) | 356 if (delegated_layer_.get()) |
| 290 delegated_layer_->SetContentsOpaque(opaque_); | 357 delegated_layer_->SetContentsOpaque(opaque_); |
| 358 if (surface_layer_.get()) | |
| 359 surface_layer_->SetContentsOpaque(opaque_); | |
| 291 } | 360 } |
| 292 | 361 |
| 293 } // namespace content | 362 } // namespace content |
| OLD | NEW |