diff options
| author | Steve Block <steveblock@google.com> | 2010-08-11 14:24:41 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:42:03 +0100 |
| commit | 71592cfffc4caa56c15e84b432898708f043d1d3 (patch) | |
| tree | 74c9b711064901d635d005f3d49fd991a7fa56a6 | |
| parent | af7a57d40c100e8c29fa6bd758313d0f27d0ac05 (diff) | |
| download | external_webkit-71592cfffc4caa56c15e84b432898708f043d1d3.zip external_webkit-71592cfffc4caa56c15e84b432898708f043d1d3.tar.gz external_webkit-71592cfffc4caa56c15e84b432898708f043d1d3.tar.bz2 | |
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
See https://android-git.corp.google.com/g/#change,61020 which picked
part of this change for EmptyDeviceOrientationClient.
See also https://bugs.webkit.org/show_bug.cgi?id=43848
Change-Id: Idefd9becf89199ae9afe475074fc56a66252db8a
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 9 | ||||
| -rw-r--r-- | WebCore/svg/graphics/SVGImage.cpp | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index c40e3cc..0d30713 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -31,6 +31,7 @@ #include "ChromeClient.h" #include "Console.h" #include "ContextMenuClient.h" +#include "DeviceMotionClient.h" #include "DeviceOrientationClient.h" #include "DocumentLoader.h" #include "DragClient.h" @@ -540,6 +541,14 @@ public: virtual bool sendMessageToFrontend(const String&) { return false; } }; +class EmptyDeviceMotionClient : public DeviceMotionClient { +public: + virtual void setController(DeviceMotionController*) { } + virtual void startUpdating() { } + virtual void stopUpdating() { } + virtual DeviceMotionData* currentDeviceMotion() const { return 0; } +}; + class EmptyDeviceOrientationClient : public DeviceOrientationClient { public: virtual void setController(DeviceOrientationController*) { } diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp index 3d60117..990e41f 100644 --- a/WebCore/svg/graphics/SVGImage.cpp +++ b/WebCore/svg/graphics/SVGImage.cpp @@ -254,6 +254,8 @@ bool SVGImage::dataChanged(bool allDataReceived) static InspectorClient* dummyInspectorClient = new EmptyInspectorClient; pageClients.inspectorClient = dummyInspectorClient; #if ENABLE(DEVICE_ORIENTATION) + static DeviceMotionClient* dummyDeviceMotionClient = new EmptyDeviceMotionClient; + pageClients.deviceMotionClient = dummyDeviceMotionClient; static DeviceOrientationClient* dummyDeviceOrientationClient = new EmptyDeviceOrientationClient; pageClients.deviceOrientationClient = dummyDeviceOrientationClient; #endif |