Merge commit 'goog/master' into webkit_merge

Resolved conflicts:
	WebCore/Android.mk
	WebCore/storage/LocalStorageArea.h
	WebCore/storage/SessionStorageArea.cpp
	WebCore/storage/StorageEvent.cpp

1 files changed, 4 insertions, 0 deletions

diff --git a/WebKit/android/jni/JavaSharedClient.h b/WebKit/android/jni/JavaSharedClient.h
index 69c05ce..bf59969 100644
--- a/WebKit/android/jni/JavaSharedClient.h
+++ b/WebKit/android/jni/JavaSharedClient.h
@@ -31,6 +31,7 @@ namespace android {
     class TimerClient;
     class CookieClient;
     class PluginClient;
+    class KeyGeneratorClient;
 
     class JavaSharedClient
     {
@@ -38,10 +39,12 @@ namespace android {
         static TimerClient* GetTimerClient(); 
         static CookieClient* GetCookieClient();
         static PluginClient* GetPluginClient();
+        static KeyGeneratorClient* GetKeyGeneratorClient();
 
         static void SetTimerClient(TimerClient* client);
         static void SetCookieClient(CookieClient* client);
         static void SetPluginClient(PluginClient* client);
+        static void SetKeyGeneratorClient(KeyGeneratorClient* client);
 
         // can be called from any thread, to be executed in webkit thread
         static void EnqueueFunctionPtr(void (*proc)(void*), void* payload);
@@ -52,6 +55,7 @@ namespace android {
         static TimerClient* gTimerClient;
         static CookieClient* gCookieClient;
         static PluginClient* gPluginClient;
+        static KeyGeneratorClient* gKeyGeneratorClient;
     };
 }
 #endif