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

Unified Diff: chrome/browser/extensions/extension_renderer_state.cc

Issue 333313004: Fix the bug that webview guest cannot load script of a SharedWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/browser/extensions/extension_renderer_state.cc
diff --git a/chrome/browser/extensions/extension_renderer_state.cc b/chrome/browser/extensions/extension_renderer_state.cc
index 341db2788cc789e4cbde81f2b1df20f39716a7b5..57e18b092bc11cb2dca0c59e2a0bfae90e19553b 100644
--- a/chrome/browser/extensions/extension_renderer_state.cc
+++ b/chrome/browser/extensions/extension_renderer_state.cc
@@ -223,12 +223,8 @@ bool ExtensionRendererState::GetTabAndWindowId(
bool ExtensionRendererState::IsWebViewRenderer(int render_process_id) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- for (WebViewInfoMap::iterator i = webview_info_map_.begin();
- i != webview_info_map_.end(); ++i) {
- if (i->first.first == render_process_id)
- return true;
- }
- return false;
+ return webview_partition_id_map.find(render_process_id) !=
+ webview_partition_id_map.end();
}
void ExtensionRendererState::AddWebView(int guest_process_id,
@@ -258,3 +254,27 @@ bool ExtensionRendererState::GetWebViewInfo(int guest_process_id,
}
return false;
}
+
+void ExtensionRendererState::AddWebViewPartitionID(
Fady Samuel 2014/06/16 21:01:56 Remove this method.
Xi Han 2014/06/16 21:53:55 Done.
+ int guest_process_id,
+ const std::string& webview_partition_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ webview_partition_id_map[guest_process_id] = webview_partition_id;
Fady Samuel 2014/06/16 21:01:56 Move this to AddWebView. You probably also need a
Xi Han 2014/06/16 21:53:55 Done.
+}
+
+void ExtensionRendererState::RemoveWebViewPartitionID(int guest_process_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ webview_partition_id_map.erase(guest_process_id);
Fady Samuel 2014/06/16 21:01:56 Move this to RemoveWebView.
Xi Han 2014/06/16 21:53:55 Done.
+}
+
+bool ExtensionRendererState::GetWebViewPartitionID(int guest_process_id,
+ std::string* partition_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ WebViewPartitionIDMap::iterator iter =
+ webview_partition_id_map.find(guest_process_id);
+ if (iter != webview_partition_id_map.end()) {
+ *partition_id = iter->second;
+ return true;
+ }
+ return false;
+}

Powered by Google App Engine
This is Rietveld 408576698