Add a method to the PlatformBridge to resolve the filename of a file

given its representation as a content:// URI, and the associated
JNI plumbing.

Requires a frameworks/base change.

Change-Id: I9b8b8bb3fbfa31c86f4212f91c140fe62c6c6682

10 files changed, 101 insertions, 23 deletions

diff --git a/WebCore/platform/android/FileChooserAndroid.cpp b/WebCore/platform/android/FileChooserAndroid.cpp
index 1f8200f..9e50e67 100644
--- a/WebCore/platform/android/FileChooserAndroid.cpp
+++ b/WebCore/platform/android/FileChooserAndroid.cpp
@@ -25,7 +25,9 @@
 
 #include "config.h"
 #include "FileChooser.h"
+#include "FileSystem.h"
 #include "Font.h"
+#include "StringTruncator.h"
 
 namespace WebCore {
 
@@ -33,14 +35,8 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
 {
     if (!m_filenames.size())
         return String();
-    // FIXME: This could be a lot faster, but assuming the data will not
-    // often be much longer than the provided width, this may be fast enough.
-    // If this does not need to be threadsafe, we can use crossThreadString().
-    // See http://trac.webkit.org/changeset/49160.
-    String output = m_filenames[0].threadsafeCopy();
-    while (font.width(TextRun(output.impl())) > width && output.length() > 4)
-        output = output.replace(0, 4, String("..."));
-    return output;
+    String output = pathGetFileName(m_filenames[0]);
+    return StringTruncator::rightTruncate(output, static_cast<float>(width), font, false);
 }
 
 } // namespace WebCore
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp
index 3d841d7..cf9830e 100644
--- a/WebCore/platform/android/FileSystemAndroid.cpp
+++ b/WebCore/platform/android/FileSystemAndroid.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "FileSystem.h"
 
+#include "PlatformBridge.h"
 #include "StringBuilder.h"
 #include "cutils/log.h"
 #include <dirent.h>
@@ -106,4 +107,14 @@ Vector<String> listDirectory(const String& path, const String& filter)
     return entries;
 }
 
+String pathGetFileName(const String& path)
+{
+    // If the path is a content:// URI then ask Java to resolve it for us.
+    if (path.startsWith("content://"))
+        return PlatformBridge::resolveFileNameForContentUri(path);
+    else
+        return path.substring(path.reverseFind('/') + 1);
+}
+
+
 } // namespace WebCore
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index ad181e6..cdd22f3 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -137,6 +137,7 @@ public:
     static bool isWebViewPaused(const FrameView*);
 
     static bool canScroll(const FrameView*);
+    static String resolveFileNameForContentUri(const String&);
 };
 
 }
diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp
index ac8c7fa..b7fcd71 100644
--- a/WebCore/platform/posix/FileSystemPOSIX.cpp
+++ b/WebCore/platform/posix/FileSystemPOSIX.cpp
@@ -213,10 +213,12 @@ bool makeAllDirectories(const String& path)
     return true;
 }
 
+#if !PLATFORM(ANDROID)
 String pathGetFileName(const String& path)
 {
     return path.substring(path.reverseFind('/') + 1);
 }
+#endif
 
 String directoryName(const String& path)
 {
diff --git a/WebKit/android/WebCoreSupport/FileSystemClient.h b/WebKit/android/WebCoreSupport/FileSystemClient.h
new file mode 100644
index 0000000..8847bda
--- /dev/null
+++ b/WebKit/android/WebCoreSupport/FileSystemClient.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010, 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 THE COPYRIGHT OWNER 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.
+ */
+
+#ifndef FILESYSTEM_CLIENT_H
+#define FILESYSTEM_CLIENT_H
+
+#include "PlatformString.h"
+
+using namespace WebCore;
+
+namespace android {
+
+class FileSystemClient {
+public:
+    virtual ~FileSystemClient() { }
+    virtual String resolveFileNameForContentUri(const String&) = 0;
+};
+}
+#endif
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 13bbf38..c64bb9d 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -27,6 +27,7 @@
 #include <PlatformBridge.h>
 
 #include "CookieClient.h"
+#include "FileSystemClient.h"
 #include "FrameView.h"
 #include "JavaSharedClient.h"
 #include "KeyGeneratorClient.h"
@@ -153,6 +154,12 @@ bool PlatformBridge::popupsAllowed(NPP)
     return false;
 }
 
+String PlatformBridge::resolveFileNameForContentUri(const String& contentUri)
+{
+    FileSystemClient* client = JavaSharedClient::GetFileSystemClient();
+    return client->resolveFileNameForContentUri(contentUri);
+}
+
 }  // namespace WebCore
 
 
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 0e65e1c..2d95f87 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -31,6 +31,7 @@
 #include "Cache.h"
 #include "Connection.h"
 #include "CookieClient.h"
+#include "FileSystemClient.h"
 #include "JavaSharedClient.h"
 #include "KeyGeneratorClient.h"
 #include "KURL.h"
@@ -62,7 +63,7 @@ static jfieldID gJavaBridge_ObjectID;
 
 // ----------------------------------------------------------------------------
    
-class JavaBridge : public TimerClient, public CookieClient, public PluginClient, public KeyGeneratorClient
+class JavaBridge : public TimerClient, public CookieClient, public PluginClient, public KeyGeneratorClient, public FileSystemClient
 {
 public:
     JavaBridge(JNIEnv* env, jobject obj);
@@ -84,6 +85,7 @@ public:
     virtual WTF::Vector<String> getSupportedKeyStrengthList();
     virtual WebCore::String getSignedPublicKeyAndChallengeString(unsigned index,
             const WebCore::String& challenge, const WebCore::KURL& url);
+    virtual WebCore::String resolveFileNameForContentUri(const WebCore::String& uri);
 
     ////////////////////////////////////////////
 
@@ -120,6 +122,7 @@ private:
     jmethodID   mSignalFuncPtrQueue;
     jmethodID   mGetKeyStrengthList;
     jmethodID   mGetSignedPublicKey;
+    jmethodID   mResolveFileNameForContentUri;
 };
 
 static void (*sSharedTimerFiredCallback)();
@@ -139,6 +142,7 @@ JavaBridge::JavaBridge(JNIEnv* env, jobject obj)
     mSignalFuncPtrQueue = env->GetMethodID(clazz, "signalServiceFuncPtrQueue", "()V");
     mGetKeyStrengthList = env->GetMethodID(clazz, "getKeyStrengthList", "()[Ljava/lang/String;");
     mGetSignedPublicKey = env->GetMethodID(clazz, "getSignedPublicKey", "(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
+    mResolveFileNameForContentUri = env->GetMethodID(clazz, "resolveFileNameForContentUri", "(Ljava/lang/String;)Ljava/lang/String;");
 
     LOG_ASSERT(mSetSharedTimer, "Could not find method setSharedTimer");
     LOG_ASSERT(mStopSharedTimer, "Could not find method stopSharedTimer");
@@ -154,6 +158,7 @@ JavaBridge::JavaBridge(JNIEnv* env, jobject obj)
     JavaSharedClient::SetCookieClient(this);
     JavaSharedClient::SetPluginClient(this);
     JavaSharedClient::SetKeyGeneratorClient(this);
+    JavaSharedClient::SetFileSystemClient(this);
 }
 
 JavaBridge::~JavaBridge()
@@ -168,6 +173,7 @@ JavaBridge::~JavaBridge()
     JavaSharedClient::SetCookieClient(NULL);
     JavaSharedClient::SetPluginClient(NULL);
     JavaSharedClient::SetKeyGeneratorClient(NULL);
+    JavaSharedClient::SetFileSystemClient(NULL);
 }
 
 void
@@ -308,6 +314,17 @@ WebCore::String JavaBridge::getSignedPublicKeyAndChallengeString(unsigned index,
     return ret;
 }
 
+WebCore::String JavaBridge::resolveFileNameForContentUri(const WebCore::String& uri) {
+    JNIEnv* env = JSC::Bindings::getJNIEnv();
+    jstring jUri = env->NewString(uri.characters(), uri.length());
+    AutoJObject obj = getRealObject(env, mJavaObject);
+    jstring path = static_cast<jstring>(env->CallObjectMethod(obj.get(), mResolveFileNameForContentUri, jUri));
+    WebCore::String ret = to_string(env, path);
+    env->DeleteLocalRef(jUri);
+    env->DeleteLocalRef(path);
+    return ret;
+}
+
 // ----------------------------------------------------------------------------
 
 void JavaBridge::Constructor(JNIEnv* env, jobject obj)
diff --git a/WebKit/android/jni/JavaSharedClient.cpp b/WebKit/android/jni/JavaSharedClient.cpp
index ce46570..e884c99 100644
--- a/WebKit/android/jni/JavaSharedClient.cpp
+++ b/WebKit/android/jni/JavaSharedClient.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "FileSystemClient.h"
 #include "JavaSharedClient.h"
 #include "TimerClient.h"
 #include "SkDeque.h"
@@ -50,6 +51,11 @@ namespace android {
         return gKeyGeneratorClient;
     }
 
+    FileSystemClient* JavaSharedClient::GetFileSystemClient()
+    {
+        return gFileSystemClient;
+    }
+
     void JavaSharedClient::SetTimerClient(TimerClient* client)
     {
         gTimerClient = client;
@@ -70,10 +76,16 @@ namespace android {
         gKeyGeneratorClient = client;
     }
 
+    void JavaSharedClient::SetFileSystemClient(FileSystemClient* client)
+    {
+        gFileSystemClient = client;
+    }
+
     TimerClient*    JavaSharedClient::gTimerClient = NULL;
     CookieClient*   JavaSharedClient::gCookieClient = NULL;
     PluginClient*   JavaSharedClient::gPluginClient = NULL;
     KeyGeneratorClient* JavaSharedClient::gKeyGeneratorClient = NULL;
+    FileSystemClient* JavaSharedClient::gFileSystemClient = NULL;
 
     ///////////////////////////////////////////////////////////////////////////
     
diff --git a/WebKit/android/jni/JavaSharedClient.h b/WebKit/android/jni/JavaSharedClient.h
index d33df67..9a09280 100644
--- a/WebKit/android/jni/JavaSharedClient.h
+++ b/WebKit/android/jni/JavaSharedClient.h
@@ -32,6 +32,7 @@ namespace android {
     class CookieClient;
     class PluginClient;
     class KeyGeneratorClient;
+    class FileSystemClient;
 
     class JavaSharedClient
     {
@@ -40,11 +41,13 @@ namespace android {
         static CookieClient* GetCookieClient();
         static PluginClient* GetPluginClient();
         static KeyGeneratorClient* GetKeyGeneratorClient();
+        static FileSystemClient* GetFileSystemClient();
 
         static void SetTimerClient(TimerClient* client);
         static void SetCookieClient(CookieClient* client);
         static void SetPluginClient(PluginClient* client);
         static void SetKeyGeneratorClient(KeyGeneratorClient* client);
+        static void SetFileSystemClient(FileSystemClient* client);
 
         // can be called from any thread, to be executed in webkit thread
         static void EnqueueFunctionPtr(void (*proc)(void*), void* payload);
@@ -56,6 +59,7 @@ namespace android {
         static CookieClient* gCookieClient;
         static PluginClient* gPluginClient;
         static KeyGeneratorClient* gKeyGeneratorClient;
+        static FileSystemClient* gFileSystemClient;
     };
 }
 #endif
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 9ecb121..d1efe07 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -320,19 +320,6 @@ static jobject createJavaMapFromHTTPHeaders(JNIEnv* env, const WebCore::HTTPHead
     return hashMap;
 }
 
-// In WebViewCore.java, we artificially append the filename to the URI so that
-// webkit treats the actual display name of the file as the filename, rather
-// than the last segment of the URI (which will simply be a number).  When we
-// pass the URI up to BrowserFrame, we no longer need the appended name (in fact
-// it causes problems), so remove it here.
-// FIXME: If we rewrite pathGetFileName (the current version is in
-// FileSystemPOSIX), we can get the filename that way rather than appending it.
-static jstring uriFromUriFileName(JNIEnv* env, const WebCore::String& name)
-{
-    const WebCore::String fileName = name.left(name.reverseFind('/'));
-    return env->NewString(fileName.characters(), fileName.length());
-}
-
 // This class stores the URI and the size of each file for upload.  The URI is
 // stored so we do not have to create it again.  The size is stored so we can
 // compare the actual size of the file with the stated size.  If the actual size
@@ -341,7 +328,7 @@ static jstring uriFromUriFileName(JNIEnv* env, const WebCore::String& name)
 class FileInfo {
 public:
     FileInfo(JNIEnv* env, const WebCore::String& name) {
-        m_uri = uriFromUriFileName(env, name);
+        m_uri = env->NewString(name.characters(), name.length());
         checkException(env);
         m_size = 0;
         m_env = env;