Add frameId to chrome.tabs.executeScript/insertCSS

extensions/browser/extension_api_frame_id_map.cc

 // Copyright 2015 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/extension_api_frame_id_map.h"
 
 #include <tuple>
 
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 
 namespace extensions {
 
 namespace {
 
 // The map is accessed on the IO and UI thread, so construct it once and never
 // delete it.
 base::LazyInstance<ExtensionApiFrameIdMap>::Leaky g_map_instance =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 const int ExtensionApiFrameIdMap::kInvalidFrameId = -1;
+const int ExtensionApiFrameIdMap::kTopFrameId = 0;
 
 ExtensionApiFrameIdMap::CachedFrameIdPair::CachedFrameIdPair()
     : frame_id(kInvalidFrameId), parent_frame_id(kInvalidFrameId) {}
 
 ExtensionApiFrameIdMap::CachedFrameIdPair::CachedFrameIdPair(
     int frame_id,
     int parent_frame_id)
     : frame_id(frame_id), parent_frame_id(parent_frame_id) {}
 
 ExtensionApiFrameIdMap::RenderFrameIdKey::RenderFrameIdKey()
@@ skipping 31 matching lines @@
   return g_map_instance.Pointer();
 }
 
 int ExtensionApiFrameIdMap::GetFrameId(content::RenderFrameHost* rfh) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (!rfh)
     return kInvalidFrameId;
   if (rfh->GetParent())
     return rfh->GetFrameTreeNodeId();
-  return 0;  // Main frame.
+  return kTopFrameId;
 }
 
 int ExtensionApiFrameIdMap::GetParentFrameId(content::RenderFrameHost* rfh) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   return rfh ? GetFrameId(rfh->GetParent()) : kInvalidFrameId;
 }
 
 content::RenderFrameHost* ExtensionApiFrameIdMap::GetRenderFrameHostById(
     content::WebContents* web_contents,
     int frame_id) {
   // Although it is technically possible to map |frame_id| to a RenderFrameHost
   // without WebContents, we choose to not do that because in the extension API
   // frameIds are only guaranteed to be meaningful in combination with a tabId.
   if (!web_contents)
     return nullptr;
 
   if (frame_id == kInvalidFrameId)
     return nullptr;
 
-  if (frame_id == 0)
+  if (frame_id == kTopFrameId)
     return web_contents->GetMainFrame();
 
   DCHECK_GE(frame_id, 1);
   return web_contents->FindFrameByFrameTreeNodeId(frame_id);
 }
 
 ExtensionApiFrameIdMap::CachedFrameIdPair ExtensionApiFrameIdMap::KeyToValue(
     const RenderFrameIdKey& key) const {
   content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
       key.render_process_id, key.frame_routing_id);
@@ skipping 126 matching lines @@
 }
 
 void ExtensionApiFrameIdMap::RemoveFrameId(const RenderFrameIdKey& key) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   base::AutoLock lock(frame_id_map_lock_);
   frame_id_map_.erase(key);
 }
 
 }  // namespace extensions