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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 2928033002: Move GetDocument method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Split a DCHECK in two as suggested by boliu@. Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 9d26b8953df87e88cad9ac7cd33e9449188f1700..784f77371bf0c8d2547e6b9b100716ea5c61623b 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -54,7 +54,7 @@ GURL GetOriginOrURL(const WebFrame* frame) {
// WebRemoteFrame which does not have a document(), and the WebRemoteFrame's
// URL is not replicated. See https://crbug.com/628759.
if (top_origin.unique() && frame->Top()->IsWebLocalFrame())
- return frame->Top()->GetDocument().Url();
+ return frame->Top()->ToWebLocalFrame()->GetDocument().Url();
return top_origin.GetURL();
}
@@ -182,7 +182,7 @@ bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) {
void ContentSettingsObserver::DidCommitProvisionalLoad(
bool is_new_navigation,
bool is_same_document_navigation) {
- WebFrame* frame = render_frame()->GetWebFrame();
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
if (frame->Parent())
return; // Not a top-level navigation.
@@ -307,7 +307,7 @@ bool ContentSettingsObserver::AllowScript(bool enabled_per_settings) {
if (is_interstitial_page_)
return true;
- WebFrame* frame = render_frame()->GetWebFrame();
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
const auto it = cached_script_permissions_.find(frame);
if (it != cached_script_permissions_.end())
return it->second;
@@ -347,7 +347,7 @@ bool ContentSettingsObserver::AllowScriptFromSource(
}
bool ContentSettingsObserver::AllowStorage(bool local) {
- WebFrame* frame = render_frame()->GetWebFrame();
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
if (frame->GetSecurityOrigin().IsUnique() ||
frame->Top()->GetSecurityOrigin().IsUnique())
return false;
@@ -423,7 +423,7 @@ bool ContentSettingsObserver::AllowAutoplay(bool default_value) {
if (!content_setting_rules_)
return default_value;
- WebFrame* frame = render_frame()->GetWebFrame();
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
return GetContentSettingFromRules(
content_setting_rules_->autoplay_rules, frame,
url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()) ==
@@ -480,7 +480,7 @@ void ContentSettingsObserver::ClearBlockedContentSettings() {
bool ContentSettingsObserver::IsPlatformApp() {
#if BUILDFLAG(ENABLE_EXTENSIONS)
- WebFrame* frame = render_frame()->GetWebFrame();
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
WebSecurityOrigin origin = frame->GetDocument().GetSecurityOrigin();
const extensions::Extension* extension = GetExtension(origin);
return extension && extension->is_platform_app();
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698