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

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

Issue 1796293003: Image decode color: Push color profile from browser to renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 685
686 webview()->setDisplayMode(display_mode_); 686 webview()->setDisplayMode(display_mode_);
687 webview()->settings()->setPreferCompositingToLCDTextEnabled( 687 webview()->settings()->setPreferCompositingToLCDTextEnabled(
688 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 688 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
689 webview()->settings()->setThreadedScrollingEnabled( 689 webview()->settings()->setThreadedScrollingEnabled(
690 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); 690 !command_line.HasSwitch(switches::kDisableThreadedScrolling));
691 webview()->settings()->setRootLayerScrolls( 691 webview()->settings()->setRootLayerScrolls(
692 command_line.HasSwitch(switches::kRootLayerScrolls)); 692 command_line.HasSwitch(switches::kRootLayerScrolls));
693 webview()->setShowFPSCounter( 693 webview()->setShowFPSCounter(
694 command_line.HasSwitch(cc::switches::kShowFPSCounter)); 694 command_line.HasSwitch(cc::switches::kShowFPSCounter));
695 webview()->setDeviceColorProfile(params.image_decode_color_profile);
695 696
696 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); 697 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);
697 698
698 if (switches::IsTouchDragDropEnabled()) 699 if (switches::IsTouchDragDropEnabled())
699 webview()->settings()->setTouchDragDropEnabled(true); 700 webview()->settings()->setTouchDragDropEnabled(true);
700 701
701 WebSettings::SelectionStrategyType selection_strategy = 702 WebSettings::SelectionStrategyType selection_strategy =
702 WebSettings::SelectionStrategyType::Character; 703 WebSettings::SelectionStrategyType::Character;
703 const std::string selection_strategy_str = 704 const std::string selection_strategy_str =
704 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 705 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
(...skipping 2723 matching lines...) Expand 10 before | Expand all | Expand 10 after
3428 if (IsUseZoomForDSFEnabled()) { 3429 if (IsUseZoomForDSFEnabled()) {
3429 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3430 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3430 } else { 3431 } else {
3431 webview()->setDeviceScaleFactor(device_scale_factor_); 3432 webview()->setDeviceScaleFactor(device_scale_factor_);
3432 } 3433 }
3433 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3434 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3434 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3435 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3435 } 3436 }
3436 3437
3437 } // namespace content 3438 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698