Rename DeviceOrientationManager to DeviceMotionAndOrientationManager

Requires a corresponding change in frameworks/base ...
https://android-git.corp.google.com/g/74335

Change-Id: I8158a8a65e83fa1d0a80233250921dae2c2b4d76

9 files changed, 36 insertions, 36 deletions

diff --git a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp
index fae11c1..f8de733 100644
--- a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp
@@ -75,7 +75,7 @@ void DeviceMotionClientAndroid::deviceMotionControllerDestroyed()
 DeviceMotionClient* DeviceMotionClientAndroid::client() const
 {
     if (!m_client) {
-        m_client = m_webViewCore->deviceOrientationManager()->motionClient();
+        m_client = m_webViewCore->deviceMotionAndOrientationManager()->motionClient();
         m_client->setController(m_controller);
     }
     return m_client;
diff --git a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp
index 3f5f32b..9d7145c 100644
--- a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp
@@ -75,7 +75,7 @@ void DeviceOrientationClientAndroid::deviceOrientationControllerDestroyed()
 DeviceOrientationClient* DeviceOrientationClientAndroid::client() const
 {
     if (!m_client) {
-        m_client = m_webViewCore->deviceOrientationManager()->orientationClient();
+        m_client = m_webViewCore->deviceMotionAndOrientationManager()->orientationClient();
         m_client->setController(m_controller);
     }
     return m_client;
diff --git a/WebKit/android/jni/DeviceOrientationManager.cpp b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp
index 8daafa7..0f94f16 100644
--- a/WebKit/android/jni/DeviceOrientationManager.cpp
+++ b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "DeviceOrientationManager.h"
+#include "DeviceMotionAndOrientationManager.h"
 
 #include "DeviceMotionClientImpl.h"
 #include "DeviceOrientationClientImpl.h"
@@ -40,42 +40,42 @@ using namespace WebCore;
 
 namespace android {
 
-DeviceOrientationManager::DeviceOrientationManager(WebViewCore* webViewCore)
+DeviceMotionAndOrientationManager::DeviceMotionAndOrientationManager(WebViewCore* webViewCore)
     : m_useMock(false)
     , m_webViewCore(webViewCore)
 {
 }
 
-void DeviceOrientationManager::useMock()
+void DeviceMotionAndOrientationManager::useMock()
 {
     m_useMock = true;
 }
 
-void DeviceOrientationManager::setMockMotion(PassRefPtr<DeviceMotionData> motion)
+void DeviceMotionAndOrientationManager::setMockMotion(PassRefPtr<DeviceMotionData> motion)
 {
     if (m_useMock)
         ; // TODO: There is not yet a DeviceMotion mock.
 }
 
-void DeviceOrientationManager::onMotionChange(PassRefPtr<DeviceMotionData> motion)
+void DeviceMotionAndOrientationManager::onMotionChange(PassRefPtr<DeviceMotionData> motion)
 {
     ASSERT(!m_useMock);
     static_cast<DeviceMotionClientImpl*>(m_motionClient.get())->onMotionChange(motion);
 }
 
-void DeviceOrientationManager::setMockOrientation(PassRefPtr<DeviceOrientation> orientation)
+void DeviceMotionAndOrientationManager::setMockOrientation(PassRefPtr<DeviceOrientation> orientation)
 {
     if (m_useMock)
         static_cast<DeviceOrientationClientMock*>(orientationClient())->setOrientation(orientation);
 }
 
-void DeviceOrientationManager::onOrientationChange(PassRefPtr<DeviceOrientation> orientation)
+void DeviceMotionAndOrientationManager::onOrientationChange(PassRefPtr<DeviceOrientation> orientation)
 {
     ASSERT(!m_useMock);
     static_cast<DeviceOrientationClientImpl*>(m_orientationClient.get())->onOrientationChange(orientation);
 }
 
-void DeviceOrientationManager::maybeSuspendClients()
+void DeviceMotionAndOrientationManager::maybeSuspendClients()
 {
     if (!m_useMock) {
         if (m_motionClient)
@@ -85,7 +85,7 @@ void DeviceOrientationManager::maybeSuspendClients()
     }
 }
 
-void DeviceOrientationManager::maybeResumeClients()
+void DeviceMotionAndOrientationManager::maybeResumeClients()
 {
     if (!m_useMock) {
         if (m_motionClient)
@@ -95,7 +95,7 @@ void DeviceOrientationManager::maybeResumeClients()
     }
 }
 
-DeviceMotionClient* DeviceOrientationManager::motionClient()
+DeviceMotionClient* DeviceMotionAndOrientationManager::motionClient()
 {
     // TODO: There is not yet a DeviceMotion mock.
     if (!m_motionClient)
@@ -105,7 +105,7 @@ DeviceMotionClient* DeviceOrientationManager::motionClient()
     return m_motionClient.get();
 }
 
-DeviceOrientationClient* DeviceOrientationManager::orientationClient()
+DeviceOrientationClient* DeviceMotionAndOrientationManager::orientationClient()
 {
     if (!m_orientationClient)
         m_orientationClient.set(m_useMock ? new DeviceOrientationClientMock
@@ -114,8 +114,8 @@ DeviceOrientationClient* DeviceOrientationManager::orientationClient()
     return m_orientationClient.get();
 }
 
-// JNI for android.webkit.DeviceOrientationManager
-static const char* javaDeviceOrientationManagerClass = "android/webkit/DeviceOrientationManager";
+// JNI for android.webkit.DeviceMotionAndOrientationManager
+static const char* javaDeviceMotionAndOrientationManagerClass = "android/webkit/DeviceMotionAndOrientationManager";
 
 static WebViewCore* getWebViewCore(JNIEnv* env, jobject webViewCoreObject)
 {
@@ -126,7 +126,7 @@ static WebViewCore* getWebViewCore(JNIEnv* env, jobject webViewCoreObject)
 
 static void useMock(JNIEnv* env, jobject, jobject webViewCoreObject)
 {
-    getWebViewCore(env, webViewCoreObject)->deviceOrientationManager()->useMock();
+    getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->useMock();
 }
 
 static void onMotionChange(JNIEnv* env, jobject, jobject webViewCoreObject, bool canProvideX, double x, bool canProvideY, double y, bool canProvideZ, double z, double interval)
@@ -135,22 +135,22 @@ static void onMotionChange(JNIEnv* env, jobject, jobject webViewCoreObject, bool
     RefPtr<DeviceMotionData::Acceleration> accelerationIncludingGravity = DeviceMotionData::Acceleration::create(canProvideX, x, canProvideY, y, canProvideZ, z);
     bool canProvideInterval = canProvideX || canProvideY || canProvideZ;
     RefPtr<DeviceMotionData> motion = DeviceMotionData::create(0, accelerationIncludingGravity.release(), 0, canProvideInterval, interval);
-    getWebViewCore(env, webViewCoreObject)->deviceOrientationManager()->onMotionChange(motion.release());
+    getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->onMotionChange(motion.release());
 }
 
 static void setMockOrientation(JNIEnv* env, jobject, jobject webViewCoreObject, bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
 {
     RefPtr<DeviceOrientation> orientation = DeviceOrientation::create(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma);
-    getWebViewCore(env, webViewCoreObject)->deviceOrientationManager()->setMockOrientation(orientation.release());
+    getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->setMockOrientation(orientation.release());
 }
 
 static void onOrientationChange(JNIEnv* env, jobject, jobject webViewCoreObject, bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
 {
     RefPtr<DeviceOrientation> orientation = DeviceOrientation::create(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma);
-    getWebViewCore(env, webViewCoreObject)->deviceOrientationManager()->onOrientationChange(orientation.release());
+    getWebViewCore(env, webViewCoreObject)->deviceMotionAndOrientationManager()->onOrientationChange(orientation.release());
 }
 
-static JNINativeMethod gDeviceOrientationManagerMethods[] = {
+static JNINativeMethod gDeviceMotionAndOrientationManagerMethods[] = {
     { "nativeUseMock", "(Landroid/webkit/WebViewCore;)V", (void*) useMock },
     { "nativeOnMotionChange", "(Landroid/webkit/WebViewCore;ZDZDZDD)V", (void*) onMotionChange },
     { "nativeSetMockOrientation", "(Landroid/webkit/WebViewCore;ZDZDZD)V", (void*) setMockOrientation },
@@ -159,9 +159,9 @@ static JNINativeMethod gDeviceOrientationManagerMethods[] = {
 
 int register_device_orientation_manager(JNIEnv* env)
 {
-    jclass deviceOrientationManager = env->FindClass(javaDeviceOrientationManagerClass);
+    jclass deviceOrientationManager = env->FindClass(javaDeviceMotionAndOrientationManagerClass);
     LOG_ASSERT(deviceOrientationManager, "Unable to find class");
-    return jniRegisterNativeMethods(env, javaDeviceOrientationManagerClass, gDeviceOrientationManagerMethods, NELEM(gDeviceOrientationManagerMethods));
+    return jniRegisterNativeMethods(env, javaDeviceMotionAndOrientationManagerClass, gDeviceMotionAndOrientationManagerMethods, NELEM(gDeviceMotionAndOrientationManagerMethods));
 }
 
 } // namespace android
diff --git a/WebKit/android/jni/DeviceOrientationManager.h b/WebKit/android/jni/DeviceMotionAndOrientationManager.h
index 8c22b0f..44463c1 100644
--- a/WebKit/android/jni/DeviceOrientationManager.h
+++ b/WebKit/android/jni/DeviceMotionAndOrientationManager.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DeviceOrientationManager_h
-#define DeviceOrientationManager_h
+#ifndef DeviceMotionAndOrientationManager_h
+#define DeviceMotionAndOrientationManager_h
 
 #include <DeviceMotionData.h>
 #include <DeviceMotionClient.h>
@@ -42,9 +42,9 @@ class WebViewCore;
 // DeviceOrientation may be either the real implementations or mocks. It also
 // handles setting the data on both the real and mock clients. This class is
 // owned by WebViewCore and exists to keep cruft out of that class.
-class DeviceOrientationManager {
+class DeviceMotionAndOrientationManager {
 public:
-    DeviceOrientationManager(WebViewCore*);
+    DeviceMotionAndOrientationManager(WebViewCore*);
 
     void useMock();
     void setMockMotion(PassRefPtr<WebCore::DeviceMotionData>);
@@ -65,4 +65,4 @@ private:
 
 } // namespace android
 
-#endif // DeviceOrientationManager_h
+#endif // DeviceMotionAndOrientationManager_h
diff --git a/WebKit/android/jni/DeviceMotionClientImpl.h b/WebKit/android/jni/DeviceMotionClientImpl.h
index 364f1d3..04d3a67 100644
--- a/WebKit/android/jni/DeviceMotionClientImpl.h
+++ b/WebKit/android/jni/DeviceMotionClientImpl.h
@@ -36,7 +36,7 @@ using namespace WebCore;
 
 namespace android {
 
-class DeviceOrientationManager;
+class DeviceMotionAndOrientationManager;
 class WebViewCore;
 
 class DeviceMotionClientImpl : public DeviceMotionClient {
diff --git a/WebKit/android/jni/DeviceOrientationClientImpl.h b/WebKit/android/jni/DeviceOrientationClientImpl.h
index a9a1d01..ba86083 100644
--- a/WebKit/android/jni/DeviceOrientationClientImpl.h
+++ b/WebKit/android/jni/DeviceOrientationClientImpl.h
@@ -36,7 +36,7 @@ using namespace WebCore;
 
 namespace android {
 
-class DeviceOrientationManager;
+class DeviceMotionAndOrientationManager;
 class WebViewCore;
 
 class DeviceOrientationClientImpl : public DeviceOrientationClient {
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index cb3fb57..adedf9c 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -115,7 +115,7 @@ static RegistrationMethod gWebCoreRegMethods[] = {
     { "HTML5Audio", android::register_mediaplayer_audio },
     { "HTML5VideoViewProxy", android::register_mediaplayer_video },
 #endif
-    { "DeviceOrientationManager", android::register_device_orientation_manager },
+    { "DeviceMotionAndOrientationManager", android::register_device_orientation_manager },
 };
 
 EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
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);
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index e5fd210..2ff517f 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -30,7 +30,7 @@
 #include "FileChooser.h"
 #include "CacheBuilder.h"
 #include "CachedHistory.h"
-#include "DeviceOrientationManager.h"
+#include "DeviceMotionAndOrientationManager.h"
 #include "DOMSelection.h"
 #include "PictureSet.h"
 #include "PlatformGraphicsContext.h"
@@ -499,7 +499,7 @@ namespace android {
         void notifyWebAppCanBeInstalled();
         void setWebTextViewAutoFillable(int queryId);
 
-        DeviceOrientationManager* deviceOrientationManager() { return &m_deviceOrientationManager; }
+        DeviceMotionAndOrientationManager* deviceMotionAndOrientationManager() { return &m_deviceMotionAndOrientationManager; }
 
         // these members are shared with webview.cpp
         static Mutex gFrameCacheMutex;
@@ -617,7 +617,7 @@ namespace android {
         uint32_t m_now;
 #endif
 
-        DeviceOrientationManager m_deviceOrientationManager;
+        DeviceMotionAndOrientationManager m_deviceMotionAndOrientationManager;
 
     private:
         // called from constructor, to add this to a global list