summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-12-09 11:30:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-12-09 11:30:03 -0800
commit4c60312020a74a5176fd86b0552720ac8f6121ba (patch)
treef5dca1ea716971730ae05e81c0e0b9715fc84b60 /WebKit/android
parent3d0d3fdaa1308448b47592c03cda81c7f9e1f789 (diff)
parent4b81185780aaef7695b652ceb7770e2307867c59 (diff)
downloadexternal_webkit-4c60312020a74a5176fd86b0552720ac8f6121ba.zip
external_webkit-4c60312020a74a5176fd86b0552720ac8f6121ba.tar.gz
external_webkit-4c60312020a74a5176fd86b0552720ac8f6121ba.tar.bz2
Merge change I85087ab0 into eclair-mr2
* changes: Enable orientation events.
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index c420b4c..646c5b8 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1487,6 +1487,16 @@ static jobject GetFormTextData(JNIEnv *env, jobject obj)
return hashMap;
}
+static void OrientationChanged(JNIEnv *env, jobject obj, int orientation)
+{
+#ifdef ANDROID_INSTRUMENT
+ TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter);
+#endif
+ WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
+ LOGE("Sending orientation: %d", orientation);
+ pFrame->sendOrientationChangeEvent(orientation);
+}
+
// ----------------------------------------------------------------------------
/*
@@ -1536,7 +1546,9 @@ static JNINativeMethod gBrowserFrameNativeMethods[] = {
{ "setUsernamePassword", "(Ljava/lang/String;Ljava/lang/String;)V",
(void*) SetUsernamePassword },
{ "getFormTextData", "()Ljava/util/HashMap;",
- (void*) GetFormTextData }
+ (void*) GetFormTextData },
+ { "nativeOrientationChanged", "(I)V",
+ (void*) OrientationChanged }
};
int register_webframe(JNIEnv* env)