diff options
| author | Steve Block <steveblock@google.com> | 2010-10-18 10:40:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-18 10:40:42 -0700 |
| commit | 456bc40a2584f222aecc5331f26ae5ce7a9fc8aa (patch) | |
| tree | 34c700978a109e3716afc91aad7ab5a213fe0f4d /WebKit/android/jni/WebViewCore.cpp | |
| parent | 21e501a7c1f2756aafb4a0ce635cc3da3e668b48 (diff) | |
| parent | ce9059cc142923289338127a469177d2eb57579f (diff) | |
| download | external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.zip external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.tar.gz external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.tar.bz2 | |
Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index e7e98c9..946e242 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -307,7 +307,7 @@ Mutex WebViewCore::gCursorBoundsMutex; WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* mainframe) : m_pluginInvalTimer(this, &WebViewCore::pluginInvalTimerFired) - , m_deviceOrientationManager(this) + , m_deviceMotionAndOrientationManager(this) { m_mainFrame = mainframe; @@ -3830,7 +3830,7 @@ static void Pause(JNIEnv* env, jobject obj) geolocation->suspend(); } - GET_NATIVE_VIEW(env, obj)->deviceOrientationManager()->maybeSuspendClients(); + GET_NATIVE_VIEW(env, obj)->deviceMotionAndOrientationManager()->maybeSuspendClients(); ANPEvent event; SkANP::InitEvent(&event, kLifecycle_ANPEventType); @@ -3849,7 +3849,7 @@ static void Resume(JNIEnv* env, jobject obj) geolocation->resume(); } - GET_NATIVE_VIEW(env, obj)->deviceOrientationManager()->maybeResumeClients(); + GET_NATIVE_VIEW(env, obj)->deviceMotionAndOrientationManager()->maybeResumeClients(); ANPEvent event; SkANP::InitEvent(&event, kLifecycle_ANPEventType); |