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

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

Issue 658683003: Add --enable-image-color-profiles command line switch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ~alpha-order. Created 6 years, 2 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/web_preferences.cc ('k') | no next file » | 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); 1037 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled);
1038 1038
1039 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); 1039 WebRuntimeFeatures::enableTouch(prefs.touch_enabled);
1040 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); 1040 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points);
1041 settings->setDeviceSupportsTouch(prefs.device_supports_touch); 1041 settings->setDeviceSupportsTouch(prefs.device_supports_touch);
1042 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); 1042 settings->setDeviceSupportsMouse(prefs.device_supports_mouse);
1043 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); 1043 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled);
1044 1044
1045 settings->setDeferredImageDecodingEnabled( 1045 settings->setDeferredImageDecodingEnabled(
1046 prefs.deferred_image_decoding_enabled); 1046 prefs.deferred_image_decoding_enabled);
1047 WebRuntimeFeatures::enableImageColorProfiles(
1048 prefs.image_color_profiles_enabled);
1047 settings->setShouldRespectImageOrientation( 1049 settings->setShouldRespectImageOrientation(
1048 prefs.should_respect_image_orientation); 1050 prefs.should_respect_image_orientation);
1049 1051
1050 settings->setUnsafePluginPastingEnabled(false); 1052 settings->setUnsafePluginPastingEnabled(false);
1051 settings->setEditingBehavior( 1053 settings->setEditingBehavior(
1052 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1054 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1053 1055
1054 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1056 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1055 1057
1056 settings->setViewportEnabled(prefs.viewport_enabled); 1058 settings->setViewportEnabled(prefs.viewport_enabled);
(...skipping 3135 matching lines...) Expand 10 before | Expand all | Expand 10 after
4192 std::vector<gfx::Size> sizes; 4194 std::vector<gfx::Size> sizes;
4193 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4195 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4194 if (!url.isEmpty()) 4196 if (!url.isEmpty())
4195 urls.push_back( 4197 urls.push_back(
4196 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4198 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4197 } 4199 }
4198 SendUpdateFaviconURL(urls); 4200 SendUpdateFaviconURL(urls);
4199 } 4201 }
4200 4202
4201 } // namespace content 4203 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698