Skip to content

Commit 58147c3

Browse files
committed
Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev
2 parents 4c25742 + c46bd44 commit 58147c3

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

inc/extension_qt/qml_view_executor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ class QQmlViewCmdExecutor : public QViewCmdExecutor {
9999
virtual void SetPlayingPosition(const ElementId& element, double, Error** error) NOT_SUPPORTED_IMPL;
100100
virtual void SetMute(const ElementId& element, bool, Error**error) NOT_SUPPORTED_IMPL;
101101
virtual void GetMute(const ElementId& element, bool*, Error**error) NOT_SUPPORTED_IMPL;
102-
virtual void SetPlaybackSpeed(const ElementId& element, double, Error**) NOT_SUPPORTED_IMPL;;
103-
virtual void GetPlaybackSpeed(const ElementId& element, double*, Error**) NOT_SUPPORTED_IMPL;;
102+
virtual void SetPlaybackSpeed(const ElementId& element, double, Error**error) NOT_SUPPORTED_IMPL;;
103+
virtual void GetPlaybackSpeed(const ElementId& element, double*, Error**error) NOT_SUPPORTED_IMPL;;
104104
virtual void VisualizerSource(std::string* source, Error** error) NOT_SUPPORTED_IMPL;
105105
virtual void VisualizerShowPoint(Error** error) NOT_SUPPORTED_IMPL;
106106

inc/extension_qt/qml_web_view_executor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class QmlWebViewCmdExecutor : public ViewCmdExecutor {
119119
virtual void SetPlayingPosition(const ElementId& element, double, Error**);
120120
virtual void SetMute(const ElementId& element, bool, Error**);
121121
virtual void GetMute(const ElementId& element, bool*, Error**);
122-
virtual void SetPlaybackSpeed(const ElementId& element, double*, Error**);
122+
virtual void SetPlaybackSpeed(const ElementId& element, double, Error**);
123123
virtual void GetPlaybackSpeed(const ElementId& element, double*, Error**);
124124
virtual void VisualizerSource(std::string* source, Error** error);
125125
virtual void VisualizerShowPoint(Error** error);

src/webdriver/extension_qt/qml_web_view_executor.cc

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,21 @@ void QmlWebViewCmdExecutor::SetMute(const ElementId& element, bool mute, Error**
737737
void QmlWebViewCmdExecutor::GetMute(const ElementId& element, bool* mute, Error** error) {
738738
CHECK_VIEW_EXISTANCE
739739

740-
*error = webkitProxy_->GetMute(element, mute);
740+
*error = webkitProxy_->GetMute(element, mute);
741+
}
742+
743+
void QmlWebViewCmdExecutor::SetPlaybackSpeed(const ElementId &element, double speed, Error **error)
744+
{
745+
CHECK_VIEW_EXISTANCE
746+
747+
*error = webkitProxy_->SetPlaybackSpeed(element, speed);
748+
}
749+
750+
void QmlWebViewCmdExecutor::GetPlaybackSpeed(const ElementId &element, double *speed, Error **error)
751+
{
752+
CHECK_VIEW_EXISTANCE
753+
754+
*error = webkitProxy_->GetPlaybackSpeed(element, speed);
741755
}
742756

743757
void QmlWebViewCmdExecutor::VisualizerSource(std::string* source, Error** error) {

0 commit comments

Comments
 (0)