[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit 8f1c8beb169abf25f471e2a8e17660ad44ce4cee
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 21:35:12 2010 +0000

    2010-08-11  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            Need EmptyDeviceOrientationClient and EmptyDeviceMotionClient for use with SVGImage
            https://bugs.webkit.org/show_bug.cgi?id=43848
    
            Tested by existing DeviceOrientation tests.
    
            * loader/EmptyClients.h:
            (WebCore::EmptyDeviceMotionClient::setController):
            (WebCore::EmptyDeviceMotionClient::startUpdating):
            (WebCore::EmptyDeviceMotionClient::stopUpdating):
            (WebCore::EmptyDeviceMotionClient::currentDeviceMotion):
            (WebCore::EmptyDeviceOrientationClient::setController):
            (WebCore::EmptyDeviceOrientationClient::startUpdating):
            (WebCore::EmptyDeviceOrientationClient::stopUpdating):
            (WebCore::EmptyDeviceOrientationClient::lastOrientation):
            * svg/graphics/SVGImage.cpp:
            (WebCore::SVGImage::dataChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf16c51..71a6e4f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-11  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Need EmptyDeviceOrientationClient and EmptyDeviceMotionClient for use with SVGImage
+        https://bugs.webkit.org/show_bug.cgi?id=43848
+
+        Tested by existing DeviceOrientation tests.
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyDeviceMotionClient::setController):
+        (WebCore::EmptyDeviceMotionClient::startUpdating):
+        (WebCore::EmptyDeviceMotionClient::stopUpdating):
+        (WebCore::EmptyDeviceMotionClient::currentDeviceMotion):
+        (WebCore::EmptyDeviceOrientationClient::setController):
+        (WebCore::EmptyDeviceOrientationClient::startUpdating):
+        (WebCore::EmptyDeviceOrientationClient::stopUpdating):
+        (WebCore::EmptyDeviceOrientationClient::lastOrientation):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::dataChanged):
+
 2010-08-10  Aaron Boodman  <aa at chromium.org>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index c6a73e7..45fd931 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -31,6 +31,8 @@
 #include "ChromeClient.h"
 #include "Console.h"
 #include "ContextMenuClient.h"
+#include "DeviceMotionClient.h"
+#include "DeviceOrientationClient.h"
 #include "DocumentLoader.h"
 #include "DragClient.h"
 #include "EditCommand.h"
@@ -531,6 +533,22 @@ 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*) { }
+    virtual void startUpdating() { }
+    virtual void stopUpdating() { }
+    virtual DeviceOrientation* lastOrientation() const { return 0; }
+};
+
 }
 
 #endif // EmptyClients_h
diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp
index 787764d..990e41f 100644
--- a/WebCore/svg/graphics/SVGImage.cpp
+++ b/WebCore/svg/graphics/SVGImage.cpp
@@ -253,7 +253,13 @@ bool SVGImage::dataChanged(bool allDataReceived)
 #endif
         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
+
         // FIXME: If this SVG ends up loading itself, we might leak the world.
         // The comment said that the Cache code does not know about CachedImages
         // holding Frames and won't know to break the cycle. But 

-- 
WebKit Debian packaging