summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/android/jni')
-rw-r--r--Source/WebKit/android/jni/PictureSet.cpp16
-rw-r--r--Source/WebKit/android/jni/PictureSet.h1
-rw-r--r--Source/WebKit/android/jni/ViewStateSerializer.cpp97
-rw-r--r--Source/WebKit/android/jni/WebCoreJniOnLoad.cpp2
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp8
-rw-r--r--Source/WebKit/android/jni/WebViewCore.h2
6 files changed, 122 insertions, 4 deletions
diff --git a/Source/WebKit/android/jni/PictureSet.cpp b/Source/WebKit/android/jni/PictureSet.cpp
index e4bd89c..181256c 100644
--- a/Source/WebKit/android/jni/PictureSet.cpp
+++ b/Source/WebKit/android/jni/PictureSet.cpp
@@ -81,6 +81,22 @@ PictureSet::PictureSet()
mBaseArea = mAdditionalArea = 0;
}
+PictureSet::PictureSet(SkPicture* picture)
+{
+ if (!picture)
+ return;
+ Pictures pictureAndBounds;
+ pictureAndBounds.mPicture = picture;
+ SkSafeRef(pictureAndBounds.mPicture);
+ pictureAndBounds.mEmpty = false;
+ pictureAndBounds.mArea.setRect(0, 0, picture->width(), picture->height());
+ pictureAndBounds.mSplit = false;
+ pictureAndBounds.mBase = true;
+ pictureAndBounds.mElapsed = 0;
+ pictureAndBounds.mWroteElapsed = false;
+ mPictures.append(pictureAndBounds);
+}
+
PictureSet::~PictureSet()
{
clear();
diff --git a/Source/WebKit/android/jni/PictureSet.h b/Source/WebKit/android/jni/PictureSet.h
index 907fb92..b04337c 100644
--- a/Source/WebKit/android/jni/PictureSet.h
+++ b/Source/WebKit/android/jni/PictureSet.h
@@ -54,6 +54,7 @@ namespace android {
public:
PictureSet();
PictureSet(const PictureSet& src) { set(src); }
+ PictureSet(SkPicture* picture);
virtual ~PictureSet();
void add(const SkRegion& area, SkPicture* picture,
uint32_t elapsed, bool split)
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp
new file mode 100644
index 0000000..c780e07
--- /dev/null
+++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2011, 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.
+ */
+
+#include "config.h"
+
+#include "BaseLayerAndroid.h"
+#include "CreateJavaOutputStreamAdaptor.h"
+#include "PictureSet.h"
+#include "SkPicture.h"
+
+#include <JNIUtility.h>
+#include <JNIHelp.h>
+#include <jni.h>
+
+namespace android {
+
+static bool nativeSerializeViewState(JNIEnv* env, jobject, jint jbaseLayer,
+ jobject jstream, jbyteArray jstorage)
+{
+ BaseLayerAndroid* baseLayer = (BaseLayerAndroid*) jbaseLayer;
+ if (!baseLayer)
+ return false;
+
+ SkWStream *stream = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);
+#if USE(ACCELERATED_COMPOSITING)
+ stream->write32(baseLayer->getBackgroundColor().rgb());
+#else
+ stream->write32(0);
+#endif
+ SkPicture picture;
+ PictureSet* content = baseLayer->content();
+ baseLayer->drawCanvas(picture.beginRecording(content->width(), content->height(),
+ SkPicture::kUsePathBoundsForClip_RecordingFlag));
+ picture.endRecording();
+ if (!stream)
+ return false;
+ picture.serialize(stream);
+ delete stream;
+ return true;
+}
+
+static BaseLayerAndroid* nativeDeserializeViewState(JNIEnv* env, jobject, jobject jstream,
+ jbyteArray jstorage)
+{
+ SkStream* stream = CreateJavaInputStreamAdaptor(env, jstream, jstorage);
+ if (!stream)
+ return 0;
+ BaseLayerAndroid* layer = new BaseLayerAndroid();
+ Color color = stream->readU32();
+#if USE(ACCELERATED_COMPOSITING)
+ layer->setBackgroundColor(color);
+#endif
+ SkPicture* picture = new SkPicture(stream);
+ delete stream;
+ layer->setContent(picture);
+ return layer;
+}
+
+/*
+ * JNI registration
+ */
+static JNINativeMethod gSerializerMethods[] = {
+ { "nativeSerializeViewState", "(ILjava/io/OutputStream;[B)Z",
+ (void*) nativeSerializeViewState },
+ { "nativeDeserializeViewState", "(Ljava/io/InputStream;[B)I",
+ (void*) nativeDeserializeViewState },
+};
+
+int registerViewStateSerializer(JNIEnv* env)
+{
+ return jniRegisterNativeMethods(env, "android/webkit/ViewStateSerializer",
+ gSerializerMethods, NELEM(gSerializerMethods));
+}
+
+}
diff --git a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
index 1f264a2..e9d7bc3 100644
--- a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -82,6 +82,7 @@ extern int registerWebHistory(JNIEnv*);
extern int registerWebIconDatabase(JNIEnv*);
extern int registerWebSettings(JNIEnv*);
extern int registerWebView(JNIEnv*);
+extern int registerViewStateSerializer(JNIEnv*);
#if ENABLE(DATABASE)
extern int registerWebStorage(JNIEnv*);
#endif
@@ -117,6 +118,7 @@ static RegistrationMethod gWebCoreRegMethods[] = {
{ "WebStorage", android::registerWebStorage },
#endif
{ "WebView", android::registerWebView },
+ { "ViewStateSerializer", android::registerViewStateSerializer },
{ "GeolocationPermissions", android::registerGeolocationPermissions },
{ "MockGeolocation", android::registerMockGeolocation },
#if ENABLE(VIDEO)
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index ded3965..601d4ee 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -391,7 +391,7 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
m_javaGlue->m_addMessageToConsole = GetJMethod(env, clazz, "addMessageToConsole", "(Ljava/lang/String;ILjava/lang/String;I)V");
m_javaGlue->m_formDidBlur = GetJMethod(env, clazz, "formDidBlur", "(I)V");
m_javaGlue->m_getPluginClass = GetJMethod(env, clazz, "getPluginClass", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;");
- m_javaGlue->m_showFullScreenPlugin = GetJMethod(env, clazz, "showFullScreenPlugin", "(Landroid/webkit/ViewManager$ChildView;I)V");
+ m_javaGlue->m_showFullScreenPlugin = GetJMethod(env, clazz, "showFullScreenPlugin", "(Landroid/webkit/ViewManager$ChildView;II)V");
m_javaGlue->m_hideFullScreenPlugin = GetJMethod(env, clazz, "hideFullScreenPlugin", "()V");
m_javaGlue->m_createSurface = GetJMethod(env, clazz, "createSurface", "(Landroid/view/View;)Landroid/webkit/ViewManager$ChildView;");
m_javaGlue->m_addSurface = GetJMethod(env, clazz, "addSurface", "(Landroid/view/View;IIII)Landroid/webkit/ViewManager$ChildView;");
@@ -3619,14 +3619,16 @@ jclass WebViewCore::getPluginClass(const WTF::String& libName, const char* class
}
}
-void WebViewCore::showFullScreenPlugin(jobject childView, NPP npp)
+void WebViewCore::showFullScreenPlugin(jobject childView, int32_t orientation, NPP npp)
{
JNIEnv* env = JSC::Bindings::getJNIEnv();
AutoJObject javaObject = m_javaGlue->object(env);
if (!javaObject.get())
return;
- env->CallVoidMethod(javaObject.get(), m_javaGlue->m_showFullScreenPlugin, childView, reinterpret_cast<int>(npp));
+ env->CallVoidMethod(javaObject.get(),
+ m_javaGlue->m_showFullScreenPlugin,
+ childView, orientation, reinterpret_cast<int>(npp));
checkException(env);
}
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index 0e9d80f..0dd45da 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -470,7 +470,7 @@ namespace android {
jclass getPluginClass(const WTF::String& libName, const char* className);
// Creates a full screen surface for a plugin
- void showFullScreenPlugin(jobject webkitPlugin, NPP npp);
+ void showFullScreenPlugin(jobject webkitPlugin, int32_t orientation, NPP npp);
// Instructs the UI thread to discard the plugin's full-screen surface
void hideFullScreenPlugin();
generated by cgit v1.1 at 2025-09-22 20:09:53 +0000