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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2954793002: color: Replace more instances of ICCProfile with ColorSpace (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « content/public/common/screen_info.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 params.top_controls_height = 0.f; 2474 params.top_controls_height = 0.f;
2475 params.is_fullscreen_granted = is_fullscreen_granted(); 2475 params.is_fullscreen_granted = is_fullscreen_granted();
2476 params.display_mode = display_mode_; 2476 params.display_mode = display_mode_;
2477 OnResize(params); 2477 OnResize(params);
2478 } 2478 }
2479 2479
2480 void RenderViewImpl::SetDeviceColorProfileForTesting( 2480 void RenderViewImpl::SetDeviceColorProfileForTesting(
2481 const gfx::ICCProfile& icc_profile) { 2481 const gfx::ICCProfile& icc_profile) {
2482 ResizeParams params; 2482 ResizeParams params;
2483 params.screen_info = screen_info_; 2483 params.screen_info = screen_info_;
2484 params.screen_info.icc_profile = icc_profile; 2484 params.screen_info.color_space = icc_profile.GetColorSpace();
2485 params.new_size = size(); 2485 params.new_size = size();
2486 params.visible_viewport_size = visible_viewport_size_; 2486 params.visible_viewport_size = visible_viewport_size_;
2487 params.physical_backing_size = physical_backing_size_; 2487 params.physical_backing_size = physical_backing_size_;
2488 params.browser_controls_shrink_blink_size = false; 2488 params.browser_controls_shrink_blink_size = false;
2489 params.top_controls_height = 0.f; 2489 params.top_controls_height = 0.f;
2490 params.is_fullscreen_granted = is_fullscreen_granted(); 2490 params.is_fullscreen_granted = is_fullscreen_granted();
2491 params.display_mode = display_mode_; 2491 params.display_mode = display_mode_;
2492 OnResize(params); 2492 OnResize(params);
2493 } 2493 }
2494 2494
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
2566 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, 2566 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info,
2567 nullptr); 2567 nullptr);
2568 return; 2568 return;
2569 } 2569 }
2570 idle_user_detector_->ActivityDetected(); 2570 idle_user_detector_->ActivityDetected();
2571 RenderWidget::HandleInputEvent(input_event, latency_info, 2571 RenderWidget::HandleInputEvent(input_event, latency_info,
2572 std::move(callback)); 2572 std::move(callback));
2573 } 2573 }
2574 2574
2575 } // namespace content 2575 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/screen_info.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698