| 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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 params->proxy_routing_id = proxy_route_id; | 365 params->proxy_routing_id = proxy_route_id; |
| 366 params->hidden = GetWidget()->is_hidden(); | 366 params->hidden = GetWidget()->is_hidden(); |
| 367 params->never_visible = delegate_->IsNeverVisible(); | 367 params->never_visible = delegate_->IsNeverVisible(); |
| 368 params->window_was_created_with_opener = window_was_created_with_opener; | 368 params->window_was_created_with_opener = window_was_created_with_opener; |
| 369 params->enable_auto_resize = GetWidget()->auto_resize_enabled(); | 369 params->enable_auto_resize = GetWidget()->auto_resize_enabled(); |
| 370 params->min_size = GetWidget()->min_size_for_auto_resize(); | 370 params->min_size = GetWidget()->min_size_for_auto_resize(); |
| 371 params->max_size = GetWidget()->max_size_for_auto_resize(); | 371 params->max_size = GetWidget()->max_size_for_auto_resize(); |
| 372 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); | 372 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); |
| 373 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); | 373 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); |
| 374 | 374 |
| 375 // If color correct rendering is enabled, we need to communicate it to |
| 376 // gfx::ICCProfile so the conversion requests to gfx::ColorSpace do not |
| 377 // return unspecified color space. |
| 378 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); |
| 379 gfx::ICCProfile::SetColorCorrectRendering( |
| 380 cmd->HasSwitch(cc::switches::kEnableColorCorrectRendering)); |
| 381 |
| 375 GetWidget()->GetResizeParams(¶ms->initial_size); | 382 GetWidget()->GetResizeParams(¶ms->initial_size); |
| 376 GetWidget()->SetInitialRenderSizeParams(params->initial_size); | 383 GetWidget()->SetInitialRenderSizeParams(params->initial_size); |
| 377 | |
| 378 GetProcess()->GetRendererInterface()->CreateView(std::move(params)); | 384 GetProcess()->GetRendererInterface()->CreateView(std::move(params)); |
| 379 | 385 |
| 380 // If it's enabled, tell the renderer to set up the Javascript bindings for | 386 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 381 // sending messages back to the browser. | 387 // sending messages back to the browser. |
| 382 if (GetProcess()->IsForGuestsOnly()) | 388 if (GetProcess()->IsForGuestsOnly()) |
| 383 DCHECK_EQ(0, enabled_bindings_); | 389 DCHECK_EQ(0, enabled_bindings_); |
| 384 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); | 390 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); |
| 385 // Let our delegate know that we created a RenderView. | 391 // Let our delegate know that we created a RenderView. |
| 386 delegate_->RenderViewCreated(this); | 392 delegate_->RenderViewCreated(this); |
| 387 | 393 |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1290 // Note: We are using the origin URL provided by the sender here. It may be | 1296 // Note: We are using the origin URL provided by the sender here. It may be |
| 1291 // different from the receiver's. | 1297 // different from the receiver's. |
| 1292 file_system_file.url = | 1298 file_system_file.url = |
| 1293 GURL(storage::GetIsolatedFileSystemRootURIString( | 1299 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1294 file_system_url.origin(), filesystem_id, std::string()) | 1300 file_system_url.origin(), filesystem_id, std::string()) |
| 1295 .append(register_name)); | 1301 .append(register_name)); |
| 1296 } | 1302 } |
| 1297 } | 1303 } |
| 1298 | 1304 |
| 1299 } // namespace content | 1305 } // namespace content |
| OLD | NEW |