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

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

Issue 1032603003: Remove allow-insecure-websocket-from-https-origin flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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') | 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 webview()->setDeviceScaleFactor(device_scale_factor_); 717 webview()->setDeviceScaleFactor(device_scale_factor_);
718 webview()->settings()->setPreferCompositingToLCDTextEnabled( 718 webview()->settings()->setPreferCompositingToLCDTextEnabled(
719 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 719 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
720 webview()->settings()->setThreadedScrollingEnabled( 720 webview()->settings()->setThreadedScrollingEnabled(
721 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); 721 !command_line.HasSwitch(switches::kDisableThreadedScrolling));
722 webview()->settings()->setRootLayerScrolls( 722 webview()->settings()->setRootLayerScrolls(
723 command_line.HasSwitch(switches::kRootLayerScrolls)); 723 command_line.HasSwitch(switches::kRootLayerScrolls));
724 724
725 ApplyWebPreferences(webkit_preferences_, webview()); 725 ApplyWebPreferences(webkit_preferences_, webview());
726 726
727 webview()->settings()->setAllowConnectingInsecureWebSocket(
728 command_line.HasSwitch(switches::kAllowInsecureWebSocketFromHttpsOrigin));
729
730 RenderFrameProxy* proxy = NULL; 727 RenderFrameProxy* proxy = NULL;
731 if (params.proxy_routing_id != MSG_ROUTING_NONE) { 728 if (params.proxy_routing_id != MSG_ROUTING_NONE) {
732 CHECK(params.swapped_out); 729 CHECK(params.swapped_out);
733 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( 730 proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
734 main_render_frame_.get(), params.proxy_routing_id); 731 main_render_frame_.get(), params.proxy_routing_id);
735 main_render_frame_->set_render_frame_proxy(proxy); 732 main_render_frame_->set_render_frame_proxy(proxy);
736 } 733 }
737 734
738 // In --site-per-process, just use the WebRemoteFrame as the main frame. 735 // In --site-per-process, just use the WebRemoteFrame as the main frame.
739 if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) { 736 if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) {
(...skipping 3066 matching lines...) Expand 10 before | Expand all | Expand 10 after
3806 std::vector<gfx::Size> sizes; 3803 std::vector<gfx::Size> sizes;
3807 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3804 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3808 if (!url.isEmpty()) 3805 if (!url.isEmpty())
3809 urls.push_back( 3806 urls.push_back(
3810 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3807 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3811 } 3808 }
3812 SendUpdateFaviconURL(urls); 3809 SendUpdateFaviconURL(urls);
3813 } 3810 }
3814 3811
3815 } // namespace content 3812 } // 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