Add entry point information for extensions using old adapter

Entry point information is used by Crosswalk to know what symbols
can trigger the load of the extension, in case it decides to load on
demand. The extension name is implicitly an entry point, so we just
set the extra entry points.

This should cause no changes if the Crosswalk doesn't support the
interface for setting entry points yet -- like Crosswalk 1.

diff --git a/bluetooth/bluetooth_context.cc b/bluetooth/bluetooth_context.cc
index c92b0fc..6f0bae2 100644 (file)
--- a/bluetooth/bluetooth_context.cc
+++ b/bluetooth/bluetooth_context.cc
@@ -27,6 +27,8 @@ BluetoothContext::BluetoothContext(ContextAPI* api)
 
 const char BluetoothContext::name[] = "tizen.bluetooth";
 
+const char* BluetoothContext::entry_points[] = { NULL };
+
 extern const char kSource_bluetooth_api[];
 
 const char* BluetoothContext::GetJavaScript() {

diff --git a/bluetooth/bluetooth_context.h b/bluetooth/bluetooth_context.h
index c3b0a1e..3d0faff 100644 (file)
--- a/bluetooth/bluetooth_context.h
+++ b/bluetooth/bluetooth_context.h
@@ -89,6 +89,7 @@ class BluetoothContext {
   // ExtensionAdapter implementation.
   static const char name[];
   static const char* GetJavaScript();
+  static const char* entry_points[];
   void HandleMessage(const char* message);
   void HandleSyncMessage(const char* message);
 

diff --git a/common/extension_adapter.cc b/common/extension_adapter.cc
index c1b501a..5f3efd5 100644 (file)
--- a/common/extension_adapter.cc
+++ b/common/extension_adapter.cc
@@ -5,6 +5,7 @@
 #include "common/extension_adapter.h"
 
 #include <iostream>
+#include "common/XW_Extension_EntryPoints.h"
 
 namespace {
 
@@ -13,6 +14,7 @@ XW_Extension g_extension = 0;
 const XW_CoreInterface* g_core = NULL;
 const XW_MessagingInterface* g_messaging = NULL;
 const XW_Internal_SyncMessagingInterface* g_sync_messaging = NULL;
+const XW_Internal_EntryPointsInterface* g_entry_points = NULL;
 
 }  // namespace
 
@@ -22,6 +24,7 @@ int32_t InitializeExtension(XW_Extension extension,
                             XW_GetInterface get_interface,
                             const char* name,
                             const char* api,
+                            const char** entry_points,
                             XW_CreatedInstanceCallback created,
                             XW_DestroyedInstanceCallback destroyed,
                             XW_HandleMessageCallback handle_message,
@@ -62,6 +65,15 @@ int32_t InitializeExtension(XW_Extension extension,
   }
   g_sync_messaging->Register(extension, handle_sync_message);
 
+  g_entry_points = reinterpret_cast<const XW_Internal_EntryPointsInterface*>(
+      get_interface(XW_INTERNAL_ENTRY_POINTS_INTERFACE));
+  if (!g_entry_points) {
+    std::cerr << "NOTE: Entry points interface not available in this version "
+              << "of Crosswalk, ignoring entry point data for extensions.\n";
+  } else {
+    g_entry_points->SetExtraJSEntryPoints(extension, entry_points);
+  }
+
   return XW_OK;
 }
 

diff --git a/common/extension_adapter.h b/common/extension_adapter.h
index 76638ad..651c3fa 100644 (file)
--- a/common/extension_adapter.h
+++ b/common/extension_adapter.h
@@ -13,13 +13,14 @@
 namespace internal {
 
 int32_t InitializeExtension(XW_Extension extension,
-                         XW_GetInterface get_interface,
-                         const char* name,
-                         const char* api,
-                         XW_CreatedInstanceCallback created,
-                         XW_DestroyedInstanceCallback destroyed,
-                         XW_HandleMessageCallback handle_message,
-                         XW_HandleSyncMessageCallback handle_sync_message);
+                            XW_GetInterface get_interface,
+                            const char* name,
+                            const char* api,
+                            const char** entry_points,
+                            XW_CreatedInstanceCallback created,
+                            XW_DestroyedInstanceCallback destroyed,
+                            XW_HandleMessageCallback handle_message,
+                            XW_HandleSyncMessageCallback handle_sync_message);
 
 void PostMessage(XW_Instance instance, const char* message);
 void SetSyncReply(XW_Instance instance, const char* reply);
@@ -65,7 +66,7 @@ template <class T>
 int32_t ExtensionAdapter<T>::Initialize(XW_Extension extension,
                                         XW_GetInterface get_interface) {
   return internal::InitializeExtension(
-      extension, get_interface, T::name, T::GetJavaScript(),
+      extension, get_interface, T::name, T::GetJavaScript(), T::entry_points,
       DidCreateInstance, DidDestroyInstance, HandleMessage, HandleSyncMessage);
 }
 

diff --git a/download/download_context.cc b/download/download_context.cc
index 8142697..ec9d08a 100644 (file)
--- a/download/download_context.cc
+++ b/download/download_context.cc
@@ -46,6 +46,11 @@ DownloadContext::~DownloadContext() {
 
 const char DownloadContext::name[] = "tizen.download";
 
+const char* DownloadContext::entry_points[] = {
+  "tizen.DownloadRequest",
+  NULL
+};
+
 // This will be generated from download_api.js.
 extern const char kSource_download_api[];
 

diff --git a/download/download_context.h b/download/download_context.h
index 65f4a90..8461e0c 100644 (file)
--- a/download/download_context.h
+++ b/download/download_context.h
@@ -27,6 +27,7 @@ class DownloadContext {
   // ExtensionAdapter implementation.
   static const char name[];
   static const char* GetJavaScript();
+  static const char* entry_points[];
   void HandleMessage(const char* message);
   void HandleSyncMessage(const char* message);
 

diff --git a/filesystem/filesystem_context.cc b/filesystem/filesystem_context.cc
index 673cd83..ff62918 100644 (file)
--- a/filesystem/filesystem_context.cc
+++ b/filesystem/filesystem_context.cc
@@ -52,6 +52,8 @@ FilesystemContext::~FilesystemContext() {
 
 const char FilesystemContext::name[] = "tizen.filesystem";
 
+const char* FilesystemContext::entry_points[] = { NULL };
+
 extern const char kSource_filesystem_api[];
 
 const char* FilesystemContext::GetJavaScript() {

diff --git a/filesystem/filesystem_context.h b/filesystem/filesystem_context.h
index ac03f41..4dbde8d 100644 (file)
--- a/filesystem/filesystem_context.h
+++ b/filesystem/filesystem_context.h
@@ -20,6 +20,7 @@ class FilesystemContext {
   /* ExtensionAdapter implementation */
   static const char name[];
   static const char* GetJavaScript();
+  static const char* entry_points[];
   void HandleMessage(const char* message);
   void HandleSyncMessage(const char* message);
 

diff --git a/network_bearer_selection/network_bearer_selection_context.cc b/network_bearer_selection/network_bearer_selection_context.cc
index 260ac42..45e67b2 100644 (file)
--- a/network_bearer_selection/network_bearer_selection_context.cc
+++ b/network_bearer_selection/network_bearer_selection_context.cc
@@ -17,6 +17,8 @@ NetworkBearerSelectionContext::NetworkBearerSelectionContext(ContextAPI* api)
 const char NetworkBearerSelectionContext::name[] =
     "tizen.networkbearerselection";
 
+const char* NetworkBearerSelectionContext::entry_points[] = { NULL };
+
 const char* NetworkBearerSelectionContext::GetJavaScript() {
   return kSource_network_bearer_selection_api;
 }

diff --git a/network_bearer_selection/network_bearer_selection_context.h b/network_bearer_selection/network_bearer_selection_context.h
index f4dde45..4b3a8be 100644 (file)
--- a/network_bearer_selection/network_bearer_selection_context.h
+++ b/network_bearer_selection/network_bearer_selection_context.h
@@ -24,6 +24,7 @@ class NetworkBearerSelectionContext {
   // ExtensionAdapter implementation.
   static const char name[];
   static const char* GetJavaScript();
+  static const char* entry_points[];
   void HandleMessage(const char* message);
   void HandleSyncMessage(const char* message) {}
 

diff --git a/system_info/system_info_context.cc b/system_info/system_info_context.cc
index 61e465d..1f62973 100644 (file)
--- a/system_info/system_info_context.cc
+++ b/system_info/system_info_context.cc
@@ -72,6 +72,7 @@ SystemInfoContext::~SystemInfoContext() {
 }
 
 const char SystemInfoContext::name[] = "tizen.systeminfo";
+const char* SystemInfoContext::entry_points[] = { NULL };
 
 // This will be generated from system_info_api.js.
 extern const char kSource_system_info_api[];

diff --git a/system_info/system_info_context.h b/system_info/system_info_context.h
index 8db178d..7e53887 100644 (file)
--- a/system_info/system_info_context.h
+++ b/system_info/system_info_context.h
@@ -29,6 +29,7 @@ class SystemInfoContext {
   // ExtensionAdapter implementation.
   static const char name[];
   static const char* GetJavaScript();
+  static const char* entry_points[];
   static SysInfoClassMap classes_;
   void HandleMessage(const char* message);
   void HandleSyncMessage(const char* message);