2 files changed, 84 insertions, 0 deletions

diff --git a/WebKit/android/plugins/ANPSystemInterface.cpp b/WebKit/android/plugins/ANPSystemInterface.cpp
new file mode 100644
index 0000000..a5b9bcb
--- /dev/null
+++ b/WebKit/android/plugins/ANPSystemInterface.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// must include config.h first for webkit to fiddle with new/delete
+#include "config.h"
+
+#include "android_npapi.h"
+#include "CString.h"
+#include "JavaSharedClient.h"
+#include "PluginClient.h"
+
+static const char* gApplicationDataDir = NULL;
+
+using namespace android;
+
+static const char* anp_getApplicationDataDirectory() {
+    if (NULL == gApplicationDataDir) {
+        PluginClient* client = JavaSharedClient::GetPluginClient();
+        if (!client)
+            return NULL;
+
+        WebCore::String path = client->getPluginSharedDataDirectory();
+        int length = path.length();
+        if (length == 0)
+            return NULL;
+
+        char* storage = (char*) malloc(length + 1);
+        if (NULL == storage)
+            return NULL;
+
+        memcpy(storage, path.utf8().data(), length);
+        storage[length] = '\0';
+
+        // save this assignment for last, so that if multiple threads call us
+        // (which should never happen), we never return an incomplete global.
+        // At worst, we would allocate storage for the path twice.
+        gApplicationDataDir = storage;
+    }
+    return gApplicationDataDir;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#define ASSIGN(obj, name)   (obj)->name = anp_##name
+
+void ANPSystemInterfaceV0_Init(ANPInterface* v) {
+    ANPSystemInterfaceV0* i = reinterpret_cast<ANPSystemInterfaceV0*>(v);
+
+    ASSIGN(i, getApplicationDataDirectory);
+}
diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h
index 80fd2c4..47a7494 100644
--- a/WebKit/android/plugins/android_npapi.h
+++ b/WebKit/android/plugins/android_npapi.h
@@ -117,6 +117,7 @@ typedef uint32_t ANPMatrixFlag;
 #define kWindowInterfaceV0_ANPGetValue      ((NPNVariable)1007)
 #define kBitmapInterfaceV0_ANPGetValue      ((NPNVariable)1008)
 #define kSurfaceInterfaceV0_ANPGetValue     ((NPNVariable)1009)
+#define kSystemInterfaceV0_ANPGetValue      ((NPNVariable)1010)
 
 /*  queries for which drawing model is desired (for the draw event)
 
@@ -793,6 +794,7 @@ enum ANPLifecycleActions {
     kGainFocus_ANPLifecycleAction  = 2,
     kLoseFocus_ANPLifecycleAction  = 3,
     kFreeMemory_ANPLifecycleAction = 4,
+    kOnLoad_ANPLifecycleAction     = 5,
 };
 typedef uint32_t ANPLifecycleAction;
 
@@ -870,5 +872,15 @@ struct ANPEvent {
     } data;
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// System properties
+
+struct ANPSystemInterfaceV0 : ANPInterface {
+    /** Return the path name for the current Application's plugin data directory,
+     *  or NULL if not supported
+     */
+    const char* (*getApplicationDataDirectory)();
+};
+
 #endif