| OLD | NEW |
| 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_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 params->min_size = GetWidget()->min_size_for_auto_resize(); | 368 params->min_size = GetWidget()->min_size_for_auto_resize(); |
| 369 params->max_size = GetWidget()->max_size_for_auto_resize(); | 369 params->max_size = GetWidget()->max_size_for_auto_resize(); |
| 370 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); | 370 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); |
| 371 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); | 371 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); |
| 372 | 372 |
| 373 GetWidget()->GetResizeParams(¶ms->initial_size); | 373 GetWidget()->GetResizeParams(¶ms->initial_size); |
| 374 GetWidget()->SetInitialRenderSizeParams(params->initial_size); | 374 GetWidget()->SetInitialRenderSizeParams(params->initial_size); |
| 375 | 375 |
| 376 GetProcess()->GetRendererInterface()->CreateView(std::move(params)); | 376 GetProcess()->GetRendererInterface()->CreateView(std::move(params)); |
| 377 | 377 |
| 378 // If the RWHV has not yet been set, the surface ID namespace will get | |
| 379 // passed down by the call to SetView(). | |
| 380 if (GetWidget()->GetView()) { | |
| 381 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(), | |
| 382 GetWidget()->GetView()->GetFrameSinkId())); | |
| 383 } | |
| 384 | |
| 385 // If it's enabled, tell the renderer to set up the Javascript bindings for | 378 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 386 // sending messages back to the browser. | 379 // sending messages back to the browser. |
| 387 if (GetProcess()->IsForGuestsOnly()) | 380 if (GetProcess()->IsForGuestsOnly()) |
| 388 DCHECK_EQ(0, enabled_bindings_); | 381 DCHECK_EQ(0, enabled_bindings_); |
| 389 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); | 382 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); |
| 390 // Let our delegate know that we created a RenderView. | 383 // Let our delegate know that we created a RenderView. |
| 391 delegate_->RenderViewCreated(this); | 384 delegate_->RenderViewCreated(this); |
| 392 | 385 |
| 393 // Since this method can create the main RenderFrame in the renderer process, | 386 // Since this method can create the main RenderFrame in the renderer process, |
| 394 // set the proper state on its corresponding RenderFrameHost. | 387 // set the proper state on its corresponding RenderFrameHost. |
| (...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 // Note: We are using the origin URL provided by the sender here. It may be | 1315 // Note: We are using the origin URL provided by the sender here. It may be |
| 1323 // different from the receiver's. | 1316 // different from the receiver's. |
| 1324 file_system_file.url = | 1317 file_system_file.url = |
| 1325 GURL(storage::GetIsolatedFileSystemRootURIString( | 1318 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1326 file_system_url.origin(), filesystem_id, std::string()) | 1319 file_system_url.origin(), filesystem_id, std::string()) |
| 1327 .append(register_name)); | 1320 .append(register_name)); |
| 1328 } | 1321 } |
| 1329 } | 1322 } |
| 1330 | 1323 |
| 1331 } // namespace content | 1324 } // namespace content |
| OLD | NEW |