OLD | NEW |
---|---|
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 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1062 | 1062 |
1063 settings->setSelectionIncludesAltImageText(true); | 1063 settings->setSelectionIncludesAltImageText(true); |
1064 | 1064 |
1065 settings->setV8CacheOptions( | 1065 settings->setV8CacheOptions( |
1066 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1066 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
1067 | 1067 |
1068 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); | 1068 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
1069 settings->setV8ScriptStreamingMode( | 1069 settings->setV8ScriptStreamingMode( |
1070 static_cast<WebSettings::V8ScriptStreamingMode>( | 1070 static_cast<WebSettings::V8ScriptStreamingMode>( |
1071 prefs.v8_script_streaming_mode)); | 1071 prefs.v8_script_streaming_mode)); |
1072 | 1072 |
no sievers
2015/02/04 19:30:01
you probably want to add a test, or at least a com
| |
1073 web_view->setDefaultPageScaleLimits( | |
1074 prefs.default_minimum_page_scale_factor, | |
1075 prefs.default_maximum_page_scale_factor); | |
1076 | |
1073 #if defined(OS_ANDROID) | 1077 #if defined(OS_ANDROID) |
1074 settings->setAllowCustomScrollbarInMainFrame(false); | 1078 settings->setAllowCustomScrollbarInMainFrame(false); |
1075 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1079 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1076 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1080 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1077 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1081 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1078 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1082 settings->setFullscreenSupported(prefs.fullscreen_supported); |
1079 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1083 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1080 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1084 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1081 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1085 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
1082 settings->setMediaControlsOverlayPlayButtonEnabled(true); | 1086 settings->setMediaControlsOverlayPlayButtonEnabled(true); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1124 | 1128 |
1125 settings->setPinchOverlayScrollbarThickness( | 1129 settings->setPinchOverlayScrollbarThickness( |
1126 prefs.pinch_overlay_scrollbar_thickness); | 1130 prefs.pinch_overlay_scrollbar_thickness); |
1127 settings->setRubberBandingOnCompositorThread( | 1131 settings->setRubberBandingOnCompositorThread( |
1128 prefs.rubber_banding_on_compositor_thread); | 1132 prefs.rubber_banding_on_compositor_thread); |
1129 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1133 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
1130 | 1134 |
1131 #if defined(OS_WIN) | 1135 #if defined(OS_WIN) |
1132 settings->setShowContextMenuOnMouseUp(true); | 1136 settings->setShowContextMenuOnMouseUp(true); |
1133 #endif | 1137 #endif |
1134 | |
1135 web_view->setDefaultPageScaleLimits( | |
1136 prefs.default_minimum_page_scale_factor, | |
1137 prefs.default_maximum_page_scale_factor); | |
1138 } | 1138 } |
1139 | 1139 |
1140 /*static*/ | 1140 /*static*/ |
1141 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, | 1141 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, |
1142 CompositorDependencies* compositor_deps, | 1142 CompositorDependencies* compositor_deps, |
1143 bool was_created_by_renderer) { | 1143 bool was_created_by_renderer) { |
1144 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1144 DCHECK(params.view_id != MSG_ROUTING_NONE); |
1145 RenderViewImpl* render_view = NULL; | 1145 RenderViewImpl* render_view = NULL; |
1146 if (g_create_render_view_impl) | 1146 if (g_create_render_view_impl) |
1147 render_view = g_create_render_view_impl(params); | 1147 render_view = g_create_render_view_impl(params); |
(...skipping 2943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4091 std::vector<gfx::Size> sizes; | 4091 std::vector<gfx::Size> sizes; |
4092 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4092 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4093 if (!url.isEmpty()) | 4093 if (!url.isEmpty()) |
4094 urls.push_back( | 4094 urls.push_back( |
4095 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4095 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4096 } | 4096 } |
4097 SendUpdateFaviconURL(urls); | 4097 SendUpdateFaviconURL(urls); |
4098 } | 4098 } |
4099 | 4099 |
4100 } // namespace content | 4100 } // namespace content |
OLD | NEW |