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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 2928033002: Move GetDocument method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Rebasing... 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/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index fedd53caf15a4da66eece46d91d1c156f233c924..a45075139658964d24412ee7345171af8a8d8e28 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -782,7 +782,9 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if (is_nacl_mime_type || is_pnacl_mime_type) {
// Normal NaCl/PNaCl embed. The app URL is the page URL.
manifest_url = url;
- app_url = frame->Top()->GetDocument().Url();
+ // TODO(lukasza, alexmos): https://crbug.com/728295: Don't assume
+ // that the top frame is local.
+ app_url = frame->Top()->ToWebLocalFrame()->GetDocument().Url();
Łukasz Anforowicz 2017/06/15 20:15:59 This isn't worse than the current code, right?
dcheng 2017/06/15 23:17:00 Doesn't seem worse =/ Didn't we have to "fix" thi
Łukasz Anforowicz 2017/06/16 19:39:24 Ack.
} else {
// NaCl is being invoked as a content handler. Look up the NaCl
// module using the MIME type. The app URL is the manifest URL.
@@ -1367,9 +1369,8 @@ bool ChromeContentRendererClient::ShouldGatherSiteIsolationStats() const {
std::unique_ptr<blink::WebContentSettingsClient>
ChromeContentRendererClient::CreateWorkerContentSettingsClient(
- content::RenderFrame* render_frame,
- WebFrame* frame) {
- return base::MakeUnique<WorkerContentSettingsClient>(render_frame, frame);
+ content::RenderFrame* render_frame) {
+ return base::MakeUnique<WorkerContentSettingsClient>(render_frame);
}
bool ChromeContentRendererClient::IsPluginAllowedToUseDevChannelAPIs() {

Powered by Google App Engine
This is Rietveld 408576698