Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2106303002: Color: Rename gfx::ColorProfile to gfx::ColorSpace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "net/base/filename_util.h" 80 #include "net/base/filename_util.h"
81 #include "net/base/url_util.h" 81 #include "net/base/url_util.h"
82 #include "net/url_request/url_request_context_getter.h" 82 #include "net/url_request/url_request_context_getter.h"
83 #include "storage/browser/fileapi/isolated_context.h" 83 #include "storage/browser/fileapi/isolated_context.h"
84 #include "third_party/skia/include/core/SkBitmap.h" 84 #include "third_party/skia/include/core/SkBitmap.h"
85 #include "ui/base/clipboard/clipboard.h" 85 #include "ui/base/clipboard/clipboard.h"
86 #include "ui/base/touch/touch_device.h" 86 #include "ui/base/touch/touch_device.h"
87 #include "ui/base/touch/touch_enabled.h" 87 #include "ui/base/touch/touch_enabled.h"
88 #include "ui/base/ui_base_switches.h" 88 #include "ui/base/ui_base_switches.h"
89 #include "ui/gfx/animation/animation.h" 89 #include "ui/gfx/animation/animation.h"
90 #include "ui/gfx/color_profile.h" 90 #include "ui/gfx/color_space.h"
91 #include "ui/gfx/image/image_skia.h" 91 #include "ui/gfx/image/image_skia.h"
92 #include "ui/gfx/native_widget_types.h" 92 #include "ui/gfx/native_widget_types.h"
93 #include "ui/native_theme/native_theme_switches.h" 93 #include "ui/native_theme/native_theme_switches.h"
94 #include "url/url_constants.h" 94 #include "url/url_constants.h"
95 95
96 #if defined(OS_WIN) 96 #if defined(OS_WIN)
97 #include "ui/display/win/dpi.h" 97 #include "ui/display/win/dpi.h"
98 #include "ui/gfx/geometry/dip_util.h" 98 #include "ui/gfx/geometry/dip_util.h"
99 #include "ui/gfx/platform_font_win.h" 99 #include "ui/gfx/platform_font_win.h"
100 #endif 100 #endif
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_profile =
374 gfx::ColorProfile::GetFromBestMonitor().profile(); 374 gfx::ColorSpace::FromBestMonitor().GetICCProfile();
375 GetWidget()->GetResizeParams(&params.initial_size); 375 GetWidget()->GetResizeParams(&params.initial_size);
376 376
377 if (!Send(new ViewMsg_New(params))) 377 if (!Send(new ViewMsg_New(params)))
378 return false; 378 return false;
379 GetWidget()->SetInitialRenderSizeParams(params.initial_size); 379 GetWidget()->SetInitialRenderSizeParams(params.initial_size);
380 380
381 // If the RWHV has not yet been set, the surface ID namespace will get 381 // If the RWHV has not yet been set, the surface ID namespace will get
382 // passed down by the call to SetView(). 382 // passed down by the call to SetView().
383 if (GetWidget()->GetView()) { 383 if (GetWidget()->GetView()) {
384 Send(new ViewMsg_SetSurfaceIdNamespace( 384 Send(new ViewMsg_SetSurfaceIdNamespace(
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 // Note: We are using the origin URL provided by the sender here. It may be 1331 // Note: We are using the origin URL provided by the sender here. It may be
1332 // different from the receiver's. 1332 // different from the receiver's.
1333 file_system_file.url = 1333 file_system_file.url =
1334 GURL(storage::GetIsolatedFileSystemRootURIString( 1334 GURL(storage::GetIsolatedFileSystemRootURIString(
1335 file_system_url.origin(), filesystem_id, std::string()) 1335 file_system_url.origin(), filesystem_id, std::string())
1336 .append(register_name)); 1336 .append(register_name));
1337 } 1337 }
1338 } 1338 }
1339 1339
1340 } // namespace content 1340 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698