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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 params.replicated_frame_state = replicated_frame_state; | 363 params.replicated_frame_state = replicated_frame_state; |
364 params.proxy_routing_id = proxy_route_id; | 364 params.proxy_routing_id = proxy_route_id; |
365 params.hidden = GetWidget()->is_hidden(); | 365 params.hidden = GetWidget()->is_hidden(); |
366 params.never_visible = delegate_->IsNeverVisible(); | 366 params.never_visible = delegate_->IsNeverVisible(); |
367 params.window_was_created_with_opener = window_was_created_with_opener; | 367 params.window_was_created_with_opener = window_was_created_with_opener; |
368 params.next_page_id = next_page_id; | 368 params.next_page_id = next_page_id; |
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_profile = | 373 params.image_decode_color_space = gfx::ColorSpace::FromBestMonitor(); |
374 gfx::ColorSpace::FromBestMonitor().GetICCProfile(); | |
375 GetWidget()->GetResizeParams(¶ms.initial_size); | 374 GetWidget()->GetResizeParams(¶ms.initial_size); |
376 | 375 |
377 if (!Send(new ViewMsg_New(params))) | 376 if (!Send(new ViewMsg_New(params))) |
378 return false; | 377 return false; |
379 GetWidget()->SetInitialRenderSizeParams(params.initial_size); | 378 GetWidget()->SetInitialRenderSizeParams(params.initial_size); |
380 | 379 |
381 // If the RWHV has not yet been set, the surface ID namespace will get | 380 // If the RWHV has not yet been set, the surface ID namespace will get |
382 // passed down by the call to SetView(). | 381 // passed down by the call to SetView(). |
383 if (GetWidget()->GetView()) { | 382 if (GetWidget()->GetView()) { |
384 Send(new ViewMsg_SetSurfaceClientId( | 383 Send(new ViewMsg_SetSurfaceClientId( |
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1331 // Note: We are using the origin URL provided by the sender here. It may be | 1330 // Note: We are using the origin URL provided by the sender here. It may be |
1332 // different from the receiver's. | 1331 // different from the receiver's. |
1333 file_system_file.url = | 1332 file_system_file.url = |
1334 GURL(storage::GetIsolatedFileSystemRootURIString( | 1333 GURL(storage::GetIsolatedFileSystemRootURIString( |
1335 file_system_url.origin(), filesystem_id, std::string()) | 1334 file_system_url.origin(), filesystem_id, std::string()) |
1336 .append(register_name)); | 1335 .append(register_name)); |
1337 } | 1336 } |
1338 } | 1337 } |
1339 | 1338 |
1340 } // namespace content | 1339 } // namespace content |
OLD | NEW |