From ead4f84fc3cd23892070ab07ac1a04619d19c1ae Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Thu, 12 May 2011 12:45:16 +0100
Subject: [PATCH] Clean up DeviceMotionClientImpl and
 DeviceOrientationClientImpl

This is in preparation for the fix for null weak global references.
No functional change.

Bug: 4336862
Change-Id: I1718df5e4b443471e3c166e5ad8ae984b395ec38
---
 WebKit/android/jni/DeviceMotionClientImpl.h      | 5 ++---
 WebKit/android/jni/DeviceOrientationClientImpl.h | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WebKit/android/jni/DeviceMotionClientImpl.h b/WebKit/android/jni/DeviceMotionClientImpl.h
index 04d3a6766..c979098ba 100644
--- a/WebKit/android/jni/DeviceMotionClientImpl.h
+++ b/WebKit/android/jni/DeviceMotionClientImpl.h
@@ -42,6 +42,7 @@ class WebViewCore;
 class DeviceMotionClientImpl : public DeviceMotionClient {
 public:
     DeviceMotionClientImpl(WebViewCore*);
+    virtual ~DeviceMotionClientImpl();
 
     void onMotionChange(PassRefPtr<DeviceMotionData>);
     void suspend();
@@ -54,9 +55,7 @@ public:
     virtual void setController(DeviceMotionController* controller) { m_controller = controller; }
     virtual void deviceMotionControllerDestroyed() { }
 
-protected:
-    virtual ~DeviceMotionClientImpl();
-
+private:
     jobject getJavaInstance();
     void releaseJavaInstance();
 
diff --git a/WebKit/android/jni/DeviceOrientationClientImpl.h b/WebKit/android/jni/DeviceOrientationClientImpl.h
index ba8608393..0e3f6b310 100644
--- a/WebKit/android/jni/DeviceOrientationClientImpl.h
+++ b/WebKit/android/jni/DeviceOrientationClientImpl.h
@@ -42,6 +42,7 @@ class WebViewCore;
 class DeviceOrientationClientImpl : public DeviceOrientationClient {
 public:
     DeviceOrientationClientImpl(WebViewCore*);
+    virtual ~DeviceOrientationClientImpl();
 
     void onOrientationChange(PassRefPtr<DeviceOrientation>);
     void suspend();
@@ -54,9 +55,7 @@ public:
     virtual void setController(DeviceOrientationController* controller) { m_controller = controller; }
     virtual void deviceOrientationControllerDestroyed() { }
 
-protected:
-    virtual ~DeviceOrientationClientImpl();
-
+private:
     jobject getJavaInstance();
     void releaseJavaInstance();
 
-- 
2.11.0