| 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 params->next_page_id = next_page_id; | 370 params->next_page_id = next_page_id; |
| 371 params->enable_auto_resize = GetWidget()->auto_resize_enabled(); | 371 params->enable_auto_resize = GetWidget()->auto_resize_enabled(); |
| 372 params->min_size = GetWidget()->min_size_for_auto_resize(); | 372 params->min_size = GetWidget()->min_size_for_auto_resize(); |
| 373 params->max_size = GetWidget()->max_size_for_auto_resize(); | 373 params->max_size = GetWidget()->max_size_for_auto_resize(); |
| 374 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); | 374 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); |
| 375 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); | 375 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); |
| 376 | 376 |
| 377 GetWidget()->GetResizeParams(¶ms->initial_size); | 377 GetWidget()->GetResizeParams(¶ms->initial_size); |
| 378 GetWidget()->SetInitialRenderSizeParams(params->initial_size); | 378 GetWidget()->SetInitialRenderSizeParams(params->initial_size); |
| 379 | 379 |
| 380 RenderProcessHostImpl* process = | 380 RenderProcessHostImpl::GetRendererInterface(GetProcess())->CreateView( |
| 381 static_cast<RenderProcessHostImpl*>(GetProcess()); | 381 std::move(params)); |
| 382 process->GetRendererInterface()->CreateView(std::move(params)); | |
| 383 | 382 |
| 384 // If the RWHV has not yet been set, the surface ID namespace will get | 383 // If the RWHV has not yet been set, the surface ID namespace will get |
| 385 // passed down by the call to SetView(). | 384 // passed down by the call to SetView(). |
| 386 if (GetWidget()->GetView()) { | 385 if (GetWidget()->GetView()) { |
| 387 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(), | 386 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(), |
| 388 GetWidget()->GetView()->GetFrameSinkId())); | 387 GetWidget()->GetView()->GetFrameSinkId())); |
| 389 } | 388 } |
| 390 | 389 |
| 391 // If it's enabled, tell the renderer to set up the Javascript bindings for | 390 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 392 // sending messages back to the browser. | 391 // sending messages back to the browser. |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1327 // Note: We are using the origin URL provided by the sender here. It may be | 1326 // Note: We are using the origin URL provided by the sender here. It may be |
| 1328 // different from the receiver's. | 1327 // different from the receiver's. |
| 1329 file_system_file.url = | 1328 file_system_file.url = |
| 1330 GURL(storage::GetIsolatedFileSystemRootURIString( | 1329 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1331 file_system_url.origin(), filesystem_id, std::string()) | 1330 file_system_url.origin(), filesystem_id, std::string()) |
| 1332 .append(register_name)); | 1331 .append(register_name)); |
| 1333 } | 1332 } |
| 1334 } | 1333 } |
| 1335 | 1334 |
| 1336 } // namespace content | 1335 } // namespace content |
| OLD | NEW |