- Revision
- 120655
- Author
- [email protected]
- Date
- 2012-06-18 18:38:22 -0700 (Mon, 18 Jun 2012)
Log Message
[Chromium] DeviceOrientation Cleanup
https://bugs.webkit.org/show_bug.cgi?id=89354
Patch by Amy Ousterhout <[email protected]> on 2012-06-18
Reviewed by Kent Tamura.
Source/WebCore:
No new tests because there is no intended change in behavior.
* platform/mock/DeviceOrientationClientMock.h: added OVERRIDE specifier for virtual functions
(DeviceOrientationClientMock):
Source/WebKit/chromium:
* public/WebDeviceOrientation.h: added const-qualifiers to getters, simplified an overly-complicated parameter to two functions
(WebKit::WebDeviceOrientation::isNull):
(WebKit::WebDeviceOrientation::canProvideAlpha):
(WebKit::WebDeviceOrientation::alpha):
(WebKit::WebDeviceOrientation::canProvideBeta):
(WebKit::WebDeviceOrientation::beta):
(WebKit::WebDeviceOrientation::canProvideGamma):
(WebKit::WebDeviceOrientation::gamma):
(WebKit::WebDeviceOrientation::canProvideAbsolute):
(WebKit::WebDeviceOrientation::absolute):
(WebDeviceOrientation):
* public/WebDeviceOrientationClient.h: added WEBKIT_ASSERT_NOT_REACHED to virtual functions
(WebKit::WebDeviceOrientationClient::setController):
(WebKit::WebDeviceOrientationClient::startUpdating):
(WebKit::WebDeviceOrientationClient::stopUpdating):
(WebKit::WebDeviceOrientationClient::lastOrientation):
* public/WebDeviceOrientationClientMock.h: added OVERRIDE specifier for virtual functions
(WebDeviceOrientationClientMock):
* src/DeviceOrientationClientProxy.h: designated functions as 'virtual' and added OVERRIDE specifier
(DeviceOrientationClientProxy):
* src/WebDeviceOrientation.cpp: simplified overly-complicated parameter to two functions
(WebKit::WebDeviceOrientation::WebDeviceOrientation):
(WebKit::WebDeviceOrientation::operator=):
Tools:
* DumpRenderTree/chromium/WebViewHost.h: added OVERRIDE specifier for virtual function
(WebViewHost):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120654 => 120655)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 01:38:22 UTC (rev 120655)
@@ -1,3 +1,15 @@
+2012-06-18 Amy Ousterhout <[email protected]>
+
+ [Chromium] DeviceOrientation Cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=89354
+
+ Reviewed by Kent Tamura.
+
+ No new tests because there is no intended change in behavior.
+
+ * platform/mock/DeviceOrientationClientMock.h: added OVERRIDE specifier for virtual functions
+ (DeviceOrientationClientMock):
+
2012-06-18 Christophe Dumez <[email protected]>
[EFL] media/video-seek-past-end-playing.html is flaky
Modified: trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h (120654 => 120655)
--- trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -45,11 +45,11 @@
DeviceOrientationClientMock();
// DeviceOrientationClient
- virtual void setController(DeviceOrientationController*);
- virtual void startUpdating();
- virtual void stopUpdating();
- virtual DeviceOrientation* lastOrientation() const { return m_orientation.get(); }
- virtual void deviceOrientationControllerDestroyed() { }
+ virtual void setController(DeviceOrientationController*) OVERRIDE;
+ virtual void startUpdating() OVERRIDE;
+ virtual void stopUpdating() OVERRIDE;
+ virtual DeviceOrientation* lastOrientation() const OVERRIDE { return m_orientation.get(); }
+ virtual void deviceOrientationControllerDestroyed() OVERRIDE { }
void setOrientation(PassRefPtr<DeviceOrientation>);
Modified: trunk/Source/WebKit/chromium/ChangeLog (120654 => 120655)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 01:38:22 UTC (rev 120655)
@@ -1,3 +1,34 @@
+2012-06-18 Amy Ousterhout <[email protected]>
+
+ [Chromium] DeviceOrientation Cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=89354
+
+ Reviewed by Kent Tamura.
+
+ * public/WebDeviceOrientation.h: added const-qualifiers to getters, simplified an overly-complicated parameter to two functions
+ (WebKit::WebDeviceOrientation::isNull):
+ (WebKit::WebDeviceOrientation::canProvideAlpha):
+ (WebKit::WebDeviceOrientation::alpha):
+ (WebKit::WebDeviceOrientation::canProvideBeta):
+ (WebKit::WebDeviceOrientation::beta):
+ (WebKit::WebDeviceOrientation::canProvideGamma):
+ (WebKit::WebDeviceOrientation::gamma):
+ (WebKit::WebDeviceOrientation::canProvideAbsolute):
+ (WebKit::WebDeviceOrientation::absolute):
+ (WebDeviceOrientation):
+ * public/WebDeviceOrientationClient.h: added WEBKIT_ASSERT_NOT_REACHED to virtual functions
+ (WebKit::WebDeviceOrientationClient::setController):
+ (WebKit::WebDeviceOrientationClient::startUpdating):
+ (WebKit::WebDeviceOrientationClient::stopUpdating):
+ (WebKit::WebDeviceOrientationClient::lastOrientation):
+ * public/WebDeviceOrientationClientMock.h: added OVERRIDE specifier for virtual functions
+ (WebDeviceOrientationClientMock):
+ * src/DeviceOrientationClientProxy.h: designated functions as 'virtual' and added OVERRIDE specifier
+ (DeviceOrientationClientProxy):
+ * src/WebDeviceOrientation.cpp: simplified overly-complicated parameter to two functions
+ (WebKit::WebDeviceOrientation::WebDeviceOrientation):
+ (WebKit::WebDeviceOrientation::operator=):
+
2012-06-18 Ami Fischman <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebDeviceOrientation.h (120654 => 120655)
--- trunk/Source/WebKit/chromium/public/WebDeviceOrientation.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/public/WebDeviceOrientation.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -51,43 +51,43 @@
static WebDeviceOrientation nullOrientation() { return WebDeviceOrientation(); }
void setNull(bool isNull) { m_isNull = isNull; }
- bool isNull() { return m_isNull; }
+ bool isNull() const { return m_isNull; }
void setAlpha(double alpha)
{
m_canProvideAlpha = true;
m_alpha = alpha;
}
- bool canProvideAlpha() { return m_canProvideAlpha; }
- double alpha() { return m_alpha; }
+ bool canProvideAlpha() const { return m_canProvideAlpha; }
+ double alpha() const { return m_alpha; }
void setBeta(double beta)
{
m_canProvideBeta = true;
m_beta = beta;
}
- bool canProvideBeta() { return m_canProvideBeta; }
- double beta() { return m_beta; }
+ bool canProvideBeta() const { return m_canProvideBeta; }
+ double beta() const { return m_beta; }
void setGamma(double gamma)
{
m_canProvideGamma = true;
m_gamma = gamma;
}
- bool canProvideGamma() { return m_canProvideGamma; }
- double gamma() { return m_gamma; }
+ bool canProvideGamma() const { return m_canProvideGamma; }
+ double gamma() const { return m_gamma; }
void setAbsolute(bool absolute)
{
m_canProvideAbsolute = true;
m_absolute = absolute;
}
- bool canProvideAbsolute() {return m_canProvideAbsolute; }
- bool absolute() { return m_absolute; }
+ bool canProvideAbsolute() const {return m_canProvideAbsolute; }
+ bool absolute() const { return m_absolute; }
#if WEBKIT_IMPLEMENTATION
- WebDeviceOrientation(const WTF::PassRefPtr<WebCore::DeviceOrientation>&);
- WebDeviceOrientation& operator=(const WTF::PassRefPtr<WebCore::DeviceOrientation>&);
+ WebDeviceOrientation(const WebCore::DeviceOrientation*);
+ WebDeviceOrientation& operator=(const WebCore::DeviceOrientation*);
operator WTF::PassRefPtr<WebCore::DeviceOrientation>() const;
#endif
Modified: trunk/Source/WebKit/chromium/public/WebDeviceOrientationClient.h (120654 => 120655)
--- trunk/Source/WebKit/chromium/public/WebDeviceOrientationClient.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/public/WebDeviceOrientationClient.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -26,6 +26,9 @@
#ifndef WebDeviceOrientationClient_h
#define WebDeviceOrientationClient_h
+#include "WebDeviceOrientation.h"
+#include "platform/WebCommon.h"
+
namespace WebKit {
class WebDeviceOrientation;
@@ -35,11 +38,15 @@
public:
virtual ~WebDeviceOrientationClient() {}
- virtual void setController(WebDeviceOrientationController*) = 0;
- virtual void startUpdating() = 0;
- virtual void stopUpdating() = 0;
+ virtual void setController(WebDeviceOrientationController*) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void startUpdating() { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void stopUpdating() { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual WebDeviceOrientation lastOrientation() const = 0;
+ virtual WebDeviceOrientation lastOrientation() const
+ {
+ WEBKIT_ASSERT_NOT_REACHED();
+ return WebDeviceOrientation::nullOrientation();
+ }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h (120654 => 120655)
--- trunk/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -39,10 +39,10 @@
WEBKIT_EXPORT static WebDeviceOrientationClientMock* create();
~WebDeviceOrientationClientMock() { reset(); }
- virtual void setController(WebDeviceOrientationController*);
- virtual void startUpdating();
- virtual void stopUpdating();
- virtual WebDeviceOrientation lastOrientation() const;
+ virtual void setController(WebDeviceOrientationController*) OVERRIDE;
+ virtual void startUpdating() OVERRIDE;
+ virtual void stopUpdating() OVERRIDE;
+ virtual WebDeviceOrientation lastOrientation() const OVERRIDE;
WEBKIT_EXPORT void setOrientation(WebDeviceOrientation&);
Modified: trunk/Source/WebKit/chromium/src/DeviceOrientationClientProxy.h (120654 => 120655)
--- trunk/Source/WebKit/chromium/src/DeviceOrientationClientProxy.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/src/DeviceOrientationClientProxy.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -44,11 +44,11 @@
{
}
- void setController(WebCore::DeviceOrientationController*);
- void startUpdating();
- void stopUpdating();
- WebCore::DeviceOrientation* lastOrientation() const;
- virtual void deviceOrientationControllerDestroyed();
+ virtual void setController(WebCore::DeviceOrientationController*) OVERRIDE;
+ virtual void startUpdating() OVERRIDE;
+ virtual void stopUpdating() OVERRIDE;
+ virtual WebCore::DeviceOrientation* lastOrientation() const OVERRIDE;
+ virtual void deviceOrientationControllerDestroyed() OVERRIDE;
private:
WebDeviceOrientationClient* m_client;
Modified: trunk/Source/WebKit/chromium/src/WebDeviceOrientation.cpp (120654 => 120655)
--- trunk/Source/WebKit/chromium/src/WebDeviceOrientation.cpp 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Source/WebKit/chromium/src/WebDeviceOrientation.cpp 2012-06-19 01:38:22 UTC (rev 120655)
@@ -31,7 +31,7 @@
namespace WebKit {
-WebDeviceOrientation::WebDeviceOrientation(const PassRefPtr<WebCore::DeviceOrientation>& orientation)
+WebDeviceOrientation::WebDeviceOrientation(const WebCore::DeviceOrientation* orientation)
{
if (!orientation) {
m_isNull = true;
@@ -57,7 +57,7 @@
m_absolute = orientation->absolute();
}
-WebDeviceOrientation& WebDeviceOrientation::operator=(const PassRefPtr<WebCore::DeviceOrientation>& orientation)
+WebDeviceOrientation& WebDeviceOrientation::operator=(const WebCore::DeviceOrientation* orientation)
{
if (!orientation) {
m_isNull = true;
Modified: trunk/Tools/ChangeLog (120654 => 120655)
--- trunk/Tools/ChangeLog 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Tools/ChangeLog 2012-06-19 01:38:22 UTC (rev 120655)
@@ -1,3 +1,13 @@
+2012-06-18 Amy Ousterhout <[email protected]>
+
+ [Chromium] DeviceOrientation Cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=89354
+
+ Reviewed by Kent Tamura.
+
+ * DumpRenderTree/chromium/WebViewHost.h: added OVERRIDE specifier for virtual function
+ (WebViewHost):
+
2012-06-18 James Robinson <[email protected]>
[chromium] Stop passing deprecated 'direct' parameter to webkit_support::CreateGraphicsContext3D
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (120654 => 120655)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-06-19 01:32:28 UTC (rev 120654)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-06-19 01:38:22 UTC (rev 120655)
@@ -185,7 +185,7 @@
#if ENABLE(SCRIPTED_SPEECH)
virtual WebKit::WebSpeechRecognizer* speechRecognizer() OVERRIDE;
#endif
- virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
+ virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient() OVERRIDE;
#if ENABLE(MEDIA_STREAM)
virtual WebKit::WebUserMediaClient* userMediaClient();
#endif
