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

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

Issue 2290743002: Partial revert of https://codereview.chromium.org/1911973002/ (Closed)
Patch Set: mac libtool Created 4 years, 3 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/renderer/render_view_impl.h ('k') | content/renderer/render_view_win.cc » ('j') | 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 #include <memory> 9 #include <memory>
10 10
(...skipping 2437 matching lines...) Expand 10 before | Expand all | Expand 10 after
2448 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; 2448 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit;
2449 } 2449 }
2450 2450
2451 void RenderViewImpl::OnSetRendererPrefs( 2451 void RenderViewImpl::OnSetRendererPrefs(
2452 const RendererPreferences& renderer_prefs) { 2452 const RendererPreferences& renderer_prefs) {
2453 std::string old_accept_languages = renderer_preferences_.accept_languages; 2453 std::string old_accept_languages = renderer_preferences_.accept_languages;
2454 2454
2455 renderer_preferences_ = renderer_prefs; 2455 renderer_preferences_ = renderer_prefs;
2456 2456
2457 UpdateFontRenderingFromRendererPrefs(); 2457 UpdateFontRenderingFromRendererPrefs();
2458 UpdateThemePrefs();
2458 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); 2459 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
2459 2460
2460 #if defined(USE_DEFAULT_RENDER_THEME) 2461 #if defined(USE_DEFAULT_RENDER_THEME)
2461 if (renderer_prefs.use_custom_colors) { 2462 if (renderer_prefs.use_custom_colors) {
2462 blink::setFocusRingColor(renderer_prefs.focus_ring_color); 2463 blink::setFocusRingColor(renderer_prefs.focus_ring_color);
2463 2464
2464 if (webview()) { 2465 if (webview()) {
2465 webview()->setSelectionColors( 2466 webview()->setSelectionColors(
2466 renderer_prefs.active_selection_bg_color, 2467 renderer_prefs.active_selection_bg_color,
2467 renderer_prefs.active_selection_fg_color, 2468 renderer_prefs.active_selection_fg_color,
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
3080 return render_frame->focused_pepper_plugin(); 3081 return render_frame->focused_pepper_plugin();
3081 } 3082 }
3082 frame = frame->traverseNext(false); 3083 frame = frame->traverseNext(false);
3083 } 3084 }
3084 3085
3085 return nullptr; 3086 return nullptr;
3086 } 3087 }
3087 #endif 3088 #endif
3088 3089
3089 } // namespace content 3090 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698