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 2736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2747 const gfx::Size& disable_scrollbar_size_limit) { | 2747 const gfx::Size& disable_scrollbar_size_limit) { |
2748 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; | 2748 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; |
2749 } | 2749 } |
2750 | 2750 |
2751 void RenderViewImpl::OnSetRendererPrefs( | 2751 void RenderViewImpl::OnSetRendererPrefs( |
2752 const RendererPreferences& renderer_prefs) { | 2752 const RendererPreferences& renderer_prefs) { |
2753 double old_zoom_level = renderer_preferences_.default_zoom_level; | 2753 double old_zoom_level = renderer_preferences_.default_zoom_level; |
2754 std::string old_accept_languages = renderer_preferences_.accept_languages; | 2754 std::string old_accept_languages = renderer_preferences_.accept_languages; |
2755 | 2755 |
2756 renderer_preferences_ = renderer_prefs; | 2756 renderer_preferences_ = renderer_prefs; |
| 2757 |
2757 UpdateFontRenderingFromRendererPrefs(); | 2758 UpdateFontRenderingFromRendererPrefs(); |
| 2759 UpdateThemePrefs(); |
2758 | 2760 |
2759 #if defined(USE_DEFAULT_RENDER_THEME) | 2761 #if defined(USE_DEFAULT_RENDER_THEME) |
2760 if (renderer_prefs.use_custom_colors) { | 2762 if (renderer_prefs.use_custom_colors) { |
2761 WebColorName name = blink::WebColorWebkitFocusRingColor; | 2763 WebColorName name = blink::WebColorWebkitFocusRingColor; |
2762 blink::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); | 2764 blink::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); |
2763 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); | 2765 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); |
2764 | 2766 |
2765 if (webview()) { | 2767 if (webview()) { |
2766 webview()->setSelectionColors( | 2768 webview()->setSelectionColors( |
2767 renderer_prefs.active_selection_bg_color, | 2769 renderer_prefs.active_selection_bg_color, |
(...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3800 std::vector<gfx::Size> sizes; | 3802 std::vector<gfx::Size> sizes; |
3801 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3803 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3802 if (!url.isEmpty()) | 3804 if (!url.isEmpty()) |
3803 urls.push_back( | 3805 urls.push_back( |
3804 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3806 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3805 } | 3807 } |
3806 SendUpdateFaviconURL(urls); | 3808 SendUpdateFaviconURL(urls); |
3807 } | 3809 } |
3808 | 3810 |
3809 } // namespace content | 3811 } // namespace content |
OLD | NEW |