Introduce a secondary map for enabling plznavigate

android_webview/native/aw_contents_io_thread_client_impl.cc

 // Copyright (c) 2012 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 "android_webview/native/aw_contents_io_thread_client_impl.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 39 matching lines @@
   JavaObjectWeakGlobalRef io_thread_client;
 
   IoThreadClientData();
 };
 
 IoThreadClientData::IoThreadClientData() : pending_association(false) {}
 
 typedef map<pair<int, int>, IoThreadClientData>
     RenderFrameHostToIoThreadClientType;
 
+// Needed for PlzNavigate.

[jam, 2017/03/09 22:13:05]

nit: expand on the comment to explain why navigation requests don't have RPH/RFH
IDs and instead we have to use the FTN ID

[sgurun-gerrit only, 2017/03/10 18:40:58]

Done.

+typedef map<int, IoThreadClientData> FrameTreeNodeToIoThreadClientType;
+
 static pair<int, int> GetRenderFrameHostIdPair(RenderFrameHost* rfh) {
   return pair<int, int>(rfh->GetProcess()->GetID(), rfh->GetRoutingID());
 }
 
 // RfhToIoThreadClientMap -----------------------------------------------------
 class RfhToIoThreadClientMap {
  public:
   static RfhToIoThreadClientMap* GetInstance();
   void Set(pair<int, int> rfh_id, const IoThreadClientData& client);
   bool Get(pair<int, int> rfh_id, IoThreadClientData* client);
   void Erase(pair<int, int> rfh_id);
 
+  void Set(int frame_tree_node_id, const IoThreadClientData& client);
+  bool Get(int frame_tree_node_id, IoThreadClientData* client);
+  void Erase(int frame_tree_node_id);
+
  private:
   base::Lock map_lock_;
   RenderFrameHostToIoThreadClientType rfh_to_io_thread_client_;
+  FrameTreeNodeToIoThreadClientType frame_tree_node_to_io_thread_client_;
 };
 
 // static
 LazyInstance<RfhToIoThreadClientMap>::DestructorAtExit g_instance_ =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 LazyInstance<JavaObjectWeakGlobalRef>::DestructorAtExit g_sw_instance_ =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 18 matching lines @@
 
   *client = iterator->second;
   return true;
 }
 
 void RfhToIoThreadClientMap::Erase(pair<int, int> rfh_id) {
   base::AutoLock lock(map_lock_);
   rfh_to_io_thread_client_.erase(rfh_id);
 }
 
+void RfhToIoThreadClientMap::Set(int frame_tree_node_id,
+                                 const IoThreadClientData& client) {
+  base::AutoLock lock(map_lock_);
+  frame_tree_node_to_io_thread_client_[frame_tree_node_id] = client;
+}
+
+bool RfhToIoThreadClientMap::Get(int frame_tree_node_id,
+                                 IoThreadClientData* client) {
+  base::AutoLock lock(map_lock_);
+  FrameTreeNodeToIoThreadClientType::iterator iterator =
+      frame_tree_node_to_io_thread_client_.find(frame_tree_node_id);
+  if (iterator == frame_tree_node_to_io_thread_client_.end())
+    return false;
+
+  *client = iterator->second;
+  return true;
+}
+
+void RfhToIoThreadClientMap::Erase(int frame_tree_node_id) {
+  base::AutoLock lock(map_lock_);
+  frame_tree_node_to_io_thread_client_.erase(frame_tree_node_id);
+}
+
 // ClientMapEntryUpdater ------------------------------------------------------
 
 class ClientMapEntryUpdater : public content::WebContentsObserver {
  public:
   ClientMapEntryUpdater(JNIEnv* env, WebContents* web_contents,
                         jobject jdelegate);
 
   void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
   void WebContentsDestroyed() override;
@@ skipping 11 matching lines @@
   DCHECK(jdelegate);
 
   if (web_contents->GetMainFrame())
     RenderFrameCreated(web_contents->GetMainFrame());
 }
 
 void ClientMapEntryUpdater::RenderFrameCreated(RenderFrameHost* rfh) {
   IoThreadClientData client_data;
   client_data.io_thread_client = jdelegate_;
   client_data.pending_association = false;
-  RfhToIoThreadClientMap::GetInstance()->Set(
-      GetRenderFrameHostIdPair(rfh), client_data);
+  RfhToIoThreadClientMap::GetInstance()->Set(GetRenderFrameHostIdPair(rfh),
+                                             client_data);
+  RfhToIoThreadClientMap::GetInstance()->Set(rfh->GetFrameTreeNodeId(),
+                                             client_data);
 }
 
 void ClientMapEntryUpdater::RenderFrameDeleted(RenderFrameHost* rfh) {
   RfhToIoThreadClientMap::GetInstance()->Erase(GetRenderFrameHostIdPair(rfh));
+  RfhToIoThreadClientMap::GetInstance()->Erase(rfh->GetFrameTreeNodeId());
 }
 
 void ClientMapEntryUpdater::WebContentsDestroyed() {
   delete this;
 }
 
 } // namespace
 
 // AwContentsIoThreadClientImpl -----------------------------------------------
 
 // static
 std::unique_ptr<AwContentsIoThreadClient> AwContentsIoThreadClient::FromID(
     int render_process_id,
     int render_frame_id) {
   pair<int, int> rfh_id(render_process_id, render_frame_id);
   IoThreadClientData client_data;
   if (!RfhToIoThreadClientMap::GetInstance()->Get(rfh_id, &client_data))
     return std::unique_ptr<AwContentsIoThreadClient>();
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_delegate =
       client_data.io_thread_client.get(env);
   DCHECK(!client_data.pending_association || java_delegate.is_null());
   return std::unique_ptr<AwContentsIoThreadClient>(
       new AwContentsIoThreadClientImpl(client_data.pending_association,
                                        java_delegate));
 }
 
+std::unique_ptr<AwContentsIoThreadClient> AwContentsIoThreadClient::FromID(
+    int frame_tree_node_id) {
+  IoThreadClientData client_data;
+  if (!RfhToIoThreadClientMap::GetInstance()->Get(frame_tree_node_id,
+                                                  &client_data))
+    return std::unique_ptr<AwContentsIoThreadClient>();
+
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> java_delegate =
+      client_data.io_thread_client.get(env);
+  DCHECK(!client_data.pending_association || java_delegate.is_null());
+  return std::unique_ptr<AwContentsIoThreadClient>(
+      new AwContentsIoThreadClientImpl(client_data.pending_association,
+                                       java_delegate));
+}
+
 // static
 void AwContentsIoThreadClient::SubFrameCreated(int render_process_id,
                                                int parent_render_frame_id,
                                                int child_render_frame_id) {
   pair<int, int> parent_rfh_id(render_process_id, parent_render_frame_id);
   pair<int, int> child_rfh_id(render_process_id, child_render_frame_id);
   IoThreadClientData client_data;
   if (!RfhToIoThreadClientMap::GetInstance()->Get(parent_rfh_id,
                                                   &client_data)) {
     NOTREACHED();
@@ skipping 158 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
   return Java_AwContentsIoThreadClient_shouldBlockNetworkLoads(env,
                                                                java_object_);
 }
 
 } // namespace android_webview