diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 11:02:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 11:02:22 -0700 |
| commit | 85213faae54abd12e8debbf768235403a22faa03 (patch) | |
| tree | c99c19cb44e276cc8e63fb754570df2b3071756e /Source/WebKit/android/jni | |
| parent | 6b16016137545e55521f20dd0d93682f2ad560a9 (diff) | |
| parent | f6e5bbe8804f63dfb72c5dce1e225a13b85177a7 (diff) | |
| download | external_webkit-85213faae54abd12e8debbf768235403a22faa03.zip external_webkit-85213faae54abd12e8debbf768235403a22faa03.tar.gz external_webkit-85213faae54abd12e8debbf768235403a22faa03.tar.bz2 | |
Merge "Minor clean-up in DeviceOrientation and DeviceMotion"
Diffstat (limited to 'Source/WebKit/android/jni')
| -rw-r--r-- | Source/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp | 8 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/DeviceMotionAndOrientationManager.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp b/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp index bd63f59..b69c2af 100644 --- a/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp +++ b/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp @@ -46,7 +46,7 @@ DeviceMotionAndOrientationManager::DeviceMotionAndOrientationManager(WebViewCore { } -void DeviceMotionAndOrientationManager::useMock() +void DeviceMotionAndOrientationManager::setUseMock() { m_useMock = true; } @@ -124,9 +124,9 @@ static WebViewCore* getWebViewCore(JNIEnv* env, jobject webViewCoreObject) return reinterpret_cast<WebViewCore*>(env->GetIntField(webViewCoreObject, nativeClassField)); } -static void useMock(JNIEnv* env, jobject, jobject webViewCoreObject) +static void setUseMock(JNIEnv* env, jobject, jobject webViewCoreObject) { - getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->useMock(); + getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->setUseMock(); } static void onMotionChange(JNIEnv* env, jobject, jobject webViewCoreObject, bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z, double interval) @@ -151,7 +151,7 @@ static void onOrientationChange(JNIEnv* env, jobject, jobject webViewCoreObject, } static JNINativeMethod gDeviceMotionAndOrientationManagerMethods[] = { - { "nativeUseMock", "(Landroid/webkit/WebViewCore;)V", (void*) useMock }, + { "nativeSetUseMock", "(Landroid/webkit/WebViewCore;)V", (void*) setUseMock }, { "nativeOnMotionChange", "(Landroid/webkit/WebViewCore;ZDZDZDD)V", (void*) onMotionChange }, { "nativeSetMockOrientation", "(Landroid/webkit/WebViewCore;ZDZDZD)V", (void*) setMockOrientation }, { "nativeOnOrientationChange", "(Landroid/webkit/WebViewCore;ZDZDZD)V", (void*) onOrientationChange } diff --git a/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.h b/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.h index 44463c1..cc6821d 100644 --- a/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.h +++ b/Source/WebKit/android/jni/DeviceMotionAndOrientationManager.h @@ -46,7 +46,7 @@ class DeviceMotionAndOrientationManager { public: DeviceMotionAndOrientationManager(WebViewCore*); - void useMock(); + void setUseMock(); void setMockMotion(PassRefPtr<WebCore::DeviceMotionData>); void onMotionChange(PassRefPtr<WebCore::DeviceMotionData>); void setMockOrientation(PassRefPtr<WebCore::DeviceOrientation>); |