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

Unified Diff: chrome/renderer/extensions/user_script_scheduler.cc

Issue 226043005: Fix webview.executeScript API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update InsertCss API. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/api/webview.json ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/user_script_scheduler.cc
diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc
index 9b346f7b23f8d75d342d9cdd2c96fe67c8ef9bf7..4a9bc7aab2bc60775735a08345d64d53eb203465 100644
--- a/chrome/renderer/extensions/user_script_scheduler.cc
+++ b/chrome/renderer/extensions/user_script_scheduler.cc
@@ -188,14 +188,18 @@ void UserScriptScheduler::ExecuteCodeImpl(
//
// For child frames, we just skip ones the extension doesn't have access
// to and carry on.
- if (!params.is_web_view &&
- !PermissionsData::CanExecuteScriptOnPage(extension,
- child_frame->document().url(),
- top_url,
- extension_helper->tab_id(),
- NULL,
- -1,
- NULL)) {
+
+ bool can_execute_script =
+ PermissionsData::CanExecuteScriptOnPage(extension,
+ child_frame->document().url(),
+ top_url,
+ extension_helper->tab_id(),
+ NULL,
+ -1,
+ NULL);
+ if ((!params.is_web_view && !can_execute_script) ||
+ (params.is_web_view &&
+ child_frame->document().url() != params.webview_src)) {
if (child_frame->parent()) {
continue;
} else {
« no previous file with comments | « chrome/common/extensions/api/webview.json ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698