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

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

Issue 695613005: Revert of Add --root-layer-scrolls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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') | 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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 744
745 g_view_map.Get().insert(std::make_pair(webview(), this)); 745 g_view_map.Get().insert(std::make_pair(webview(), this));
746 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); 746 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this));
747 webview()->setDeviceScaleFactor(device_scale_factor_); 747 webview()->setDeviceScaleFactor(device_scale_factor_);
748 webview()->settings()->setPreferCompositingToLCDTextEnabled( 748 webview()->settings()->setPreferCompositingToLCDTextEnabled(
749 PreferCompositingToLCDText(device_scale_factor_)); 749 PreferCompositingToLCDText(device_scale_factor_));
750 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( 750 webview()->settings()->setAcceleratedCompositingForTransitionEnabled(
751 ShouldUseTransitionCompositing(device_scale_factor_)); 751 ShouldUseTransitionCompositing(device_scale_factor_));
752 webview()->settings()->setThreadedScrollingEnabled( 752 webview()->settings()->setThreadedScrollingEnabled(
753 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); 753 !command_line.HasSwitch(switches::kDisableThreadedScrolling));
754 webview()->settings()->setRootLayerScrolls(
755 command_line.HasSwitch(switches::kRootLayerScrolls));
756 754
757 ApplyWebPreferences(webkit_preferences_, webview()); 755 ApplyWebPreferences(webkit_preferences_, webview());
758 756
759 webview()->settings()->setAllowConnectingInsecureWebSocket( 757 webview()->settings()->setAllowConnectingInsecureWebSocket(
760 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin)); 758 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
761 759
762 RenderFrameProxy* proxy = NULL; 760 RenderFrameProxy* proxy = NULL;
763 if (params->proxy_routing_id != MSG_ROUTING_NONE) { 761 if (params->proxy_routing_id != MSG_ROUTING_NONE) {
764 CHECK(params->swapped_out); 762 CHECK(params->swapped_out);
765 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( 763 proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
(...skipping 3453 matching lines...) Expand 10 before | Expand all | Expand 10 after
4219 std::vector<gfx::Size> sizes; 4217 std::vector<gfx::Size> sizes;
4220 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4218 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4221 if (!url.isEmpty()) 4219 if (!url.isEmpty())
4222 urls.push_back( 4220 urls.push_back(
4223 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4221 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4224 } 4222 }
4225 SendUpdateFaviconURL(urls); 4223 SendUpdateFaviconURL(urls);
4226 } 4224 }
4227 4225
4228 } // namespace content 4226 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698