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

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

Issue 2875333003: color: Make layout tests specify color space by command line flag (Closed)
Patch Set: Rebaseline tests Created 3 years, 7 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/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 10
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 if (command_line.HasSwitch(switches::kStatsCollectionController)) 625 if (command_line.HasSwitch(switches::kStatsCollectionController))
626 stats_collection_observer_.reset(new StatsCollectionObserver(this)); 626 stats_collection_observer_.reset(new StatsCollectionObserver(this));
627 627
628 webview()->SetDisplayMode(display_mode_); 628 webview()->SetDisplayMode(display_mode_);
629 webview()->GetSettings()->SetPreferCompositingToLCDTextEnabled( 629 webview()->GetSettings()->SetPreferCompositingToLCDTextEnabled(
630 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 630 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
631 webview()->GetSettings()->SetThreadedScrollingEnabled( 631 webview()->GetSettings()->SetThreadedScrollingEnabled(
632 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); 632 !command_line.HasSwitch(switches::kDisableThreadedScrolling));
633 webview()->SetShowFPSCounter( 633 webview()->SetShowFPSCounter(
634 command_line.HasSwitch(cc::switches::kShowFPSCounter)); 634 command_line.HasSwitch(cc::switches::kShowFPSCounter));
635 635 webview()->SetDeviceColorProfile(params.image_decode_color_space);
636 if (std::unique_ptr<gfx::ICCProfile> overridden_color_profile =
637 GetContentClient()->renderer()->GetImageDecodeColorProfile()) {
638 webview()->SetDeviceColorProfile(*overridden_color_profile);
639 } else {
640 webview()->SetDeviceColorProfile(params.image_decode_color_space);
641 }
642 636
643 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); 637 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);
644 638
645 if (switches::IsTouchDragDropEnabled()) 639 if (switches::IsTouchDragDropEnabled())
646 webview()->GetSettings()->SetTouchDragDropEnabled(true); 640 webview()->GetSettings()->SetTouchDragDropEnabled(true);
647 641
648 webview()->GetSettings()->SetBrowserSideNavigationEnabled( 642 webview()->GetSettings()->SetBrowserSideNavigationEnabled(
649 IsBrowserSideNavigationEnabled()); 643 IsBrowserSideNavigationEnabled());
650 644
651 WebSettings::SelectionStrategyType selection_strategy = 645 WebSettings::SelectionStrategyType selection_strategy =
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2670 input_event.GetCoalescedEventsPointers(), latency_info, 2664 input_event.GetCoalescedEventsPointers(), latency_info,
2671 dispatch_type); 2665 dispatch_type);
2672 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 2666 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
2673 } 2667 }
2674 idle_user_detector_->ActivityDetected(); 2668 idle_user_detector_->ActivityDetected();
2675 return RenderWidget::HandleInputEvent(input_event, latency_info, 2669 return RenderWidget::HandleInputEvent(input_event, latency_info,
2676 dispatch_type); 2670 dispatch_type);
2677 } 2671 }
2678 2672
2679 } // namespace content 2673 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698