diff options
| author | Steve Block <steveblock@google.com> | 2010-10-05 15:00:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 11:02:45 +0100 |
| commit | eea0127e7a587bbd6825bb2f47e86e70cb0a5be2 (patch) | |
| tree | 00042ce618802e4f62cf39bfad7322140fff8ebf | |
| parent | c287263a2fac16a4d759948cf5b41f5d1ae0ddbf (diff) | |
| download | external_webkit-eea0127e7a587bbd6825bb2f47e86e70cb0a5be2.zip external_webkit-eea0127e7a587bbd6825bb2f47e86e70cb0a5be2.tar.gz external_webkit-eea0127e7a587bbd6825bb2f47e86e70cb0a5be2.tar.bz2 | |
Merge WebKit at r68651 : Implement controller destroyed callbacks for DeviceOrientation and DeviceMotion
See http://trac.webkit.org/changeset/67949
Change-Id: Ide94a861a7468d4eef3a238696aad754c8924aed
5 files changed, 13 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp index 5ca820d..e12eacd 100644 --- a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.cpp @@ -67,6 +67,11 @@ DeviceMotionData* DeviceMotionClientAndroid::currentDeviceMotion() const return client()->currentDeviceMotion(); } +void DeviceMotionClientAndroid::deviceMotionControllerDestroyed() +{ + delete this; +} + DeviceMotionClient* DeviceMotionClientAndroid::client() const { if (!m_client) { diff --git a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.h b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.h index c38d110..98d4709 100644 --- a/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.h +++ b/WebKit/android/WebCoreSupport/DeviceMotionClientAndroid.h @@ -49,6 +49,7 @@ public: virtual void startUpdating(); virtual void stopUpdating(); virtual WebCore::DeviceMotionData* currentDeviceMotion() const; + virtual void deviceMotionControllerDestroyed(); private: WebCore::DeviceMotionClient* client() const; diff --git a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp index d6c8cd6..36fc445 100644 --- a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.cpp @@ -67,6 +67,11 @@ DeviceOrientation* DeviceOrientationClientAndroid::lastOrientation() const return client()->lastOrientation(); } +void DeviceOrientationClientAndroid::deviceOrientationControllerDestroyed() +{ + delete this; +} + DeviceOrientationClient* DeviceOrientationClientAndroid::client() const { if (!m_client) { diff --git a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.h b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.h index cc55cb8..7842b95 100644 --- a/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.h +++ b/WebKit/android/WebCoreSupport/DeviceOrientationClientAndroid.h @@ -49,6 +49,7 @@ public: virtual void startUpdating(); virtual void stopUpdating(); virtual WebCore::DeviceOrientation* lastOrientation() const; + virtual void deviceOrientationControllerDestroyed(); private: WebCore::DeviceOrientationClient* client() const; diff --git a/WebKit/android/jni/DeviceOrientationClientImpl.h b/WebKit/android/jni/DeviceOrientationClientImpl.h index 8514a6b..a9a1d01 100644 --- a/WebKit/android/jni/DeviceOrientationClientImpl.h +++ b/WebKit/android/jni/DeviceOrientationClientImpl.h @@ -52,6 +52,7 @@ public: virtual void stopUpdating(); virtual DeviceOrientation* lastOrientation() const { return m_lastOrientation.get(); } virtual void setController(DeviceOrientationController* controller) { m_controller = controller; } + virtual void deviceOrientationControllerDestroyed() { } protected: virtual ~DeviceOrientationClientImpl(); |