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

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

Issue 571963003: Add a flag to disable threaded scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Histogram update 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/content_switches.cc ('k') | tools/metrics/histograms/histograms.xml » ('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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 CompleteInit(); 752 CompleteInit();
753 } 753 }
754 754
755 g_view_map.Get().insert(std::make_pair(webview(), this)); 755 g_view_map.Get().insert(std::make_pair(webview(), this));
756 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); 756 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this));
757 webview()->setDeviceScaleFactor(device_scale_factor_); 757 webview()->setDeviceScaleFactor(device_scale_factor_);
758 webview()->settings()->setPreferCompositingToLCDTextEnabled( 758 webview()->settings()->setPreferCompositingToLCDTextEnabled(
759 PreferCompositingToLCDText(device_scale_factor_)); 759 PreferCompositingToLCDText(device_scale_factor_));
760 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( 760 webview()->settings()->setAcceleratedCompositingForTransitionEnabled(
761 ShouldUseTransitionCompositing(device_scale_factor_)); 761 ShouldUseTransitionCompositing(device_scale_factor_));
762 webview()->settings()->setThreadedScrollingEnabled(
763 !command_line.HasSwitch(switches::kDisableThreadedScrolling));
762 764
763 ApplyWebPreferences(webkit_preferences_, webview()); 765 ApplyWebPreferences(webkit_preferences_, webview());
764 766
765 webview()->settings()->setAllowConnectingInsecureWebSocket( 767 webview()->settings()->setAllowConnectingInsecureWebSocket(
766 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin)); 768 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
767 769
768 RenderFrameProxy* proxy = NULL; 770 RenderFrameProxy* proxy = NULL;
769 if (params->proxy_routing_id != MSG_ROUTING_NONE) { 771 if (params->proxy_routing_id != MSG_ROUTING_NONE) {
770 CHECK(params->swapped_out); 772 CHECK(params->swapped_out);
771 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( 773 proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
(...skipping 3442 matching lines...) Expand 10 before | Expand all | Expand 10 after
4214 std::vector<gfx::Size> sizes; 4216 std::vector<gfx::Size> sizes;
4215 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4217 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4216 if (!url.isEmpty()) 4218 if (!url.isEmpty())
4217 urls.push_back( 4219 urls.push_back(
4218 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4220 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4219 } 4221 }
4220 SendUpdateFaviconURL(urls); 4222 SendUpdateFaviconURL(urls);
4221 } 4223 }
4222 4224
4223 } // namespace content 4225 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698