summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-12 12:45:16 +0100
committerSteve Block <steveblock@google.com>2011-05-12 12:45:16 +0100
commitead4f84fc3cd23892070ab07ac1a04619d19c1ae (patch)
treefa60cb4774b22071df34249c9916d78d759b3c44
parent95c170a70196646a7aff404fae24d2856195f6ce (diff)
downloadexternal_webkit-ead4f84fc3cd23892070ab07ac1a04619d19c1ae.zip
external_webkit-ead4f84fc3cd23892070ab07ac1a04619d19c1ae.tar.gz
external_webkit-ead4f84fc3cd23892070ab07ac1a04619d19c1ae.tar.bz2
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
-rw-r--r--WebKit/android/jni/DeviceMotionClientImpl.h5
-rw-r--r--WebKit/android/jni/DeviceOrientationClientImpl.h5
2 files changed, 4 insertions, 6 deletions
diff --git a/WebKit/android/jni/DeviceMotionClientImpl.h b/WebKit/android/jni/DeviceMotionClientImpl.h
index 04d3a67..c979098 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 ba86083..0e3f6b3 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();