Remove WebViewKey in rules registry.

extensions/browser/guest_view/web_view/web_view_guest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/stop_find_action.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/api/web_view/web_view_internal_api.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/constants.h"
@@ skipping 130 matching lines @@
   // The partition name is user supplied value, which we have encoded when the
   // URL was created, so it needs to be decoded.
   *partition_name =
       net::UnescapeURLComponent(site.query(), net::UnescapeRule::NORMAL);
   return true;
 }
 
 // static
 const char WebViewGuest::Type[] = "webview";
 
+typedef std::pair<int, int> WebViewKey;
+typedef std::map<WebViewKey, int> WebViewKeyToIDMap;
+typedef std::map<int, WebViewKey> IDToWebViewKeyMap;
+static base::LazyInstance<WebViewKeyToIDMap> web_view_key_to_id_map =
+    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<IDToWebViewKeyMap> id_to_web_view_key_map =
+    LAZY_INSTANCE_INITIALIZER;
+
+// static
+int WebViewGuest::GetOrGenerateRulesRegistryID(
+    int embedder_process_id,
+    int webview_instance_id,
+    content::BrowserContext* browser_context) {
+  bool is_web_view = embedder_process_id && webview_instance_id;
+  if (!is_web_view)
+    return RulesRegistryService::kDefaultRulesRegistryID;
+
+  WebViewKey key = std::make_pair(embedder_process_id, webview_instance_id);
+  WebViewKeyToIDMap::iterator it = web_view_key_to_id_map.Get().find(key);

[Fady Samuel, 2014/11/28 11:34:24]

nit: Use auto.

auto it = web_view_key_to_id_map.Get().find(key);

[Xi Han, 2014/11/28 16:12:56]

Done. Do we use auto whenever possible?

+  if (it != web_view_key_to_id_map.Get().end()) {

[Fady Samuel, 2014/11/28 11:34:25]

No need for a new block.

[Xi Han, 2014/11/28 16:12:56]

Done.

+    return it->second;
+  }
+  int rules_registry_id =
+      RulesRegistryService::Get(browser_context)->GetNextRulesRegistryID();
+  web_view_key_to_id_map.Get()[key] = rules_registry_id;
+  id_to_web_view_key_map.Get()[rules_registry_id] = key;
+  return rules_registry_id;
+}
+
 // static
 int WebViewGuest::GetViewInstanceId(WebContents* contents) {
   WebViewGuest* guest = FromWebContents(contents);
   if (!guest)
     return guestview::kInstanceIDNone;
 
   return guest->view_instance_id();
 }
 
 const char* WebViewGuest::GetAPINamespace() const {
@@ skipping 147 matching lines @@
 void WebViewGuest::DidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEventToEmbedder(
       new GuestViewBase::Event(webview::kEventLoadStop, args.Pass()));
 }
 
 void WebViewGuest::EmbedderWillBeDestroyed() {
   if (web_view_guest_delegate_)
     web_view_guest_delegate_->OnEmbedderWillBeDestroyed();
 
+  // Clean up rules registries for the webview.
+  RulesRegistryService::Get(browser_context())
+      ->RemoveRulesRegistryID(rules_registry_id_);
+  IDToWebViewKeyMap::iterator it =
+      id_to_web_view_key_map.Get().find(rules_registry_id_);

[Fady Samuel, 2014/11/28 11:34:25]

Hmm, I don't think we need IDToWebViewKeyMap? A WebViewGuest should already know
about its embedder_process_id and view_instance_id()

[Xi Han, 2014/11/28 16:12:56]

You are right. It was used before I move the "remove rules registries" from
RulesRegistryService. Cleaned up.

+  if (it != id_to_web_view_key_map.Get().end()) {
+    web_view_key_to_id_map.Get().erase(it->second);
+    id_to_web_view_key_map.Get().erase(it);
+  }
+
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &RemoveWebViewEventListenersOnIOThread,
           browser_context(),
           embedder_extension_id(),
           embedder_render_process_id(),
           view_instance_id()));
 }
@@ skipping 301 matching lines @@
       content::StoragePartition::OriginMatcherFunction(),
       remove_since,
       base::Time::Now(),
       callback);
   return true;
 }
 
 WebViewGuest::WebViewGuest(content::BrowserContext* browser_context,
                            int guest_instance_id)
     : GuestView<WebViewGuest>(browser_context, guest_instance_id),
+      rules_registry_id_(0),

[Fady Samuel, 2014/11/28 11:34:24]

Use the kDefaultRulesRegistryID constant here?

[Xi Han, 2014/11/28 16:12:56]

Define kInvalidRulesRegistryID in RulesRegistryService.

       find_helper_(this),
       is_overriding_user_agent_(false),
       guest_opaque_(true),
       javascript_dialog_helper_(this),
       weak_ptr_factory_(this) {
   web_view_guest_delegate_.reset(
       ExtensionsAPIClient::Get()->CreateWebViewGuestDelegate(this));
 }
 
 WebViewGuest::~WebViewGuest() {
@@ skipping 124 matching lines @@
           site_url, &partition_domain, &partition_id, &in_memory)) {
     NOTREACHED();
     return;
   }
 
   WebViewRendererState::WebViewInfo web_view_info;
   web_view_info.embedder_process_id = embedder_render_process_id();
   web_view_info.instance_id = view_instance_id();
   web_view_info.partition_id = partition_id;
   web_view_info.embedder_extension_id = embedder_extension_id();
+  web_view_info.rules_registry_id = rules_registry_id_;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&WebViewRendererState::AddGuest,
                  base::Unretained(WebViewRendererState::GetInstance()),
                  web_contents()->GetRenderProcessHost()->GetID(),
                  web_contents()->GetRoutingID(),
                  web_view_info));
 }
@@ skipping 52 matching lines @@
     bool user_gesture,
     bool last_unlocked_by_target,
     const base::Callback<void(bool)>& callback) {
   web_view_permission_helper_->RequestPointerLockPermission(
       user_gesture,
       last_unlocked_by_target,
       callback);
 }
 
 void WebViewGuest::WillAttachToEmbedder() {
+  int embedder_process_id =
+      embedder_web_contents()->GetRenderProcessHost()->GetID();
+  WebViewKey key(embedder_process_id, view_instance_id());
+  WebViewKeyToIDMap::iterator it = web_view_key_to_id_map.Get().find(key);
+  if (it != web_view_key_to_id_map.Get().end())
+    rules_registry_id_ = web_view_key_to_id_map.Get().find(key)->second;

[Fady Samuel, 2014/11/28 11:34:25]

Hmm, what if add rules after attachment?

I feel like the right approach is to always allocate a rules registry ID at this
point:

rules_registry_id_ = GetOrGenerateRulesRegistryID(embedder_process_id,
view_instance_id());

[Xi Han, 2014/11/28 16:12:56]

This is a good point. Updated.

+
   // We must install the mapping from guests to WebViews prior to resuming
   // suspended resource loads so that the WebRequest API will catch resource
   // requests.
   PushWebViewStateToIOThread();
 }
 
 content::JavaScriptDialogManager* WebViewGuest::GetJavaScriptDialogManager(
     WebContents* source) {
   return &javascript_dialog_helper_;
 }
@@ skipping 322 matching lines @@
   WebViewGuest* guest =
       WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }
 
 }  // namespace extensions