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

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

Issue 2716583003: Rename Origin.unique() to opaque().
Patch Set: Update new uses post-rebase Created 3 years, 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 5068 matching lines...) Expand 10 before | Expand all | Expand 10 after
5079 else 5079 else
5080 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; 5080 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
5081 5081
5082 DCHECK(!navigation_state->request_params().should_clear_history_list); 5082 DCHECK(!navigation_state->request_params().should_clear_history_list);
5083 params.history_list_was_cleared = false; 5083 params.history_list_was_cleared = false;
5084 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; 5084 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT;
5085 // Subframes should match the zoom level of the main frame. 5085 // Subframes should match the zoom level of the main frame.
5086 render_view_->SetZoomLevel(render_view_->page_zoom_level()); 5086 render_view_->SetZoomLevel(render_view_->page_zoom_level());
5087 } 5087 }
5088 5088
5089 // Standard URLs must match the reported origin, when it is not unique. 5089 // Standard URLs must match the reported origin, when it is not opaque.
5090 // This check is very similar to RenderFrameHostImpl::CanCommitOrigin, but 5090 // This check is very similar to RenderFrameHostImpl::CanCommitOrigin, but
5091 // adapted to the renderer process side. 5091 // adapted to the renderer process side.
5092 if (!params.origin.unique() && params.url.IsStandard() && 5092 if (!params.origin.opaque() && params.url.IsStandard() &&
5093 render_view_->GetWebkitPreferences().web_security_enabled) { 5093 render_view_->GetWebkitPreferences().web_security_enabled) {
5094 // Exclude file: URLs when settings allow them access any origin. 5094 // Exclude file: URLs when settings allow them access any origin.
5095 if (params.origin.scheme() != url::kFileScheme || 5095 if (params.origin.scheme() != url::kFileScheme ||
5096 !render_view_->GetWebkitPreferences() 5096 !render_view_->GetWebkitPreferences()
5097 .allow_universal_access_from_file_urls) { 5097 .allow_universal_access_from_file_urls) {
5098 CHECK(params.origin.IsSamePhysicalOriginWith(url::Origin(params.url))) 5098 CHECK(params.origin.IsSamePhysicalOriginWith(url::Origin(params.url)))
5099 << " url:" << params.url << " origin:" << params.origin; 5099 << " url:" << params.url << " origin:" << params.origin;
5100 } 5100 }
5101 } 5101 }
5102 5102
(...skipping 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
7128 triggering_event_info(info.triggering_event_info), 7128 triggering_event_info(info.triggering_event_info),
7129 cache_disabled(info.is_cache_disabled), 7129 cache_disabled(info.is_cache_disabled),
7130 form(info.form), 7130 form(info.form),
7131 source_location(info.source_location) {} 7131 source_location(info.source_location) {}
7132 7132
7133 void RenderFrameImpl::BindWidget(mojom::WidgetRequest request) { 7133 void RenderFrameImpl::BindWidget(mojom::WidgetRequest request) {
7134 GetRenderWidget()->SetWidgetBinding(std::move(request)); 7134 GetRenderWidget()->SetWidgetBinding(std::move(request));
7135 } 7135 }
7136 7136
7137 } // namespace content 7137 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698