Register guest web view

atom/browser/web_view/web_view_guest.cc

@@ -1,11 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/web_view/web_view_guest.h"
-
-namespace atom {
-
-
-
-}  // namespace atom

atom/browser/web_view/web_view_guest.h

@@ -1,19 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_WEB_VIEW_WEB_VIEW_GUEST_H_
-#define ATOM_BROWSER_WEB_VIEW_WEB_VIEW_GUEST_H_
-
-namespace atom {
-
-// A WebViewGuest provides the browser-side implementation of the <webview> API
-// and manages the dispatch of <webview> extension events. WebViewGuest is
-// created on attachment. That is, when a guest WebContents is associated with
-// a particular embedder WebContents. This happens on either initial navigation
-// or through the use of the New Window API, when a new window is attached to
-// a particular <webview>.
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_WEB_VIEW_WEB_VIEW_GUEST_H_

atom/browser/web_view/web_view_manager.cc

@@ -4,7 +4,30 @@
 
 #include "atom/browser/web_view/web_view_manager.h"
 
-#include "base/logging.h"
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "atom/browser/atom_browser_context.h"
+#include "base/bind.h"
+#include "base/stl_util.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
+
+#include "atom/common/node_includes.h"
+
+namespace mate {
+
+template<>
+struct Converter<content::WebContents*> {
+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
+                     content::WebContents** out) {
+    atom::api::WebContents* contents;
+    if (!Converter<atom::api::WebContents*>::FromV8(isolate, val, &contents))
+      return false;
+    *out = contents->web_contents();
+    return true;
+  }
+};
+
+}  // namespace mate
 
 namespace atom {
 
@@ -14,18 +37,53 @@ WebViewManager::WebViewManager(content::BrowserContext* context) {
 WebViewManager::~WebViewManager() {
 }
 
+void WebViewManager::AddGuest(int guest_instance_id,
+                              content::WebContents* embedder,
+                              content::WebContents* web_contents) {
+  web_contents_map_[guest_instance_id] = {web_contents, embedder};
+}
+
+void WebViewManager::RemoveGuest(int guest_instance_id) {
+  web_contents_map_.erase(guest_instance_id);
+}
+
 void WebViewManager::MaybeGetGuestByInstanceIDOrKill(
     int guest_instance_id,
     int embedder_render_process_id,
     const GuestByInstanceIDCallback& callback) {
-  LOG(ERROR) << "MaybeGetGuestByInstanceIDOrKill";
-  callback.Run(nullptr);
+  if (ContainsKey(web_contents_map_, guest_instance_id))
+    callback.Run(web_contents_map_[guest_instance_id].web_contents);
+  else
+    callback.Run(nullptr);
 }
 
 bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
                                   const GuestCallback& callback) {
-  LOG(ERROR) << "ForEachGuest";
+  for (auto& item : web_contents_map_)
+    if (item.second.embedder == embedder_web_contents &&
+        callback.Run(item.second.web_contents))
+      return true;
   return false;
 }
 
 }  // namespace atom
+
+namespace {
+
+void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
+                v8::Handle<v8::Context> context, void* priv) {
+  using atom::WebViewManager;
+  auto manager = static_cast<WebViewManager*>(
+      atom::AtomBrowserContext::Get()->GetGuestManager());
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("addGuest",
+                 base::Bind(&WebViewManager::AddGuest,
+                            base::Unretained(manager)));
+  dict.SetMethod("removeGuest",
+                 base::Bind(&WebViewManager::RemoveGuest,
+                            base::Unretained(manager)));
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_web_view_manager, Initialize)

atom/browser/web_view/web_view_manager.h

@@ -5,6 +5,8 @@
 #ifndef ATOM_BROWSER_WEB_VIEW_WEB_VIEW_MANAGER_H_
 #define ATOM_BROWSER_WEB_VIEW_WEB_VIEW_MANAGER_H_
 
+#include <map>
+
 #include "content/public/browser/browser_plugin_guest_manager.h"
 
 namespace content {
@@ -18,6 +20,12 @@ class WebViewManager : public content::BrowserPluginGuestManager {
   explicit WebViewManager(content::BrowserContext* context);
   virtual ~WebViewManager();
 
+  void AddGuest(int guest_instance_id,
+                content::WebContents* embedder,
+                content::WebContents* web_contents);
+  void RemoveGuest(int guest_instance_id);
+
+ protected:
   // content::BrowserPluginGuestManager:
   virtual void MaybeGetGuestByInstanceIDOrKill(
       int guest_instance_id,
@@ -27,6 +35,12 @@ class WebViewManager : public content::BrowserPluginGuestManager {
                             const GuestCallback& callback) override;
 
  private:
+  struct WebContentsWithEmbedder {
+    content::WebContents* web_contents;  // Weak ref.
+    content::WebContents* embedder;
+  };
+  std::map<int, WebContentsWithEmbedder> web_contents_map_;
+
   DISALLOW_COPY_AND_ASSIGN(WebViewManager);
 };