Skip to content

Commit 4fba3d1

Browse files
committed
Added browser connection command for QGraphicsWebView and QDeclarativeWebView
1 parent e2395c4 commit 4fba3d1

File tree

7 files changed

+57
-16
lines changed

7 files changed

+57
-16
lines changed

inc/extension_qt/graphics_web_view_executor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class GraphicsWebViewCmdExecutor : public ViewCmdExecutor {
127127
virtual void AcceptOrDismissAlert(bool accept, Error** error) NOT_SUPPORTED_IMPL;
128128
virtual void SetOrientation(const std::string &orientation, Error **error) NOT_SUPPORTED_IMPL;
129129
virtual void GetOrientation(std::string *orientation, Error **error);
130-
virtual void SetOnline(bool, Error** error) NOT_SUPPORTED_IMPL;
131-
virtual void IsOnline(bool*, Error** error) NOT_SUPPORTED_IMPL;
130+
virtual void SetOnline(bool, Error** error);
131+
virtual void IsOnline(bool*, Error** error);
132132

133133
protected:
134134
QGraphicsWebView* getView(const ViewId& viewId, Error** error);

inc/extension_qt/qml_web_view_executor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ class QmlWebViewCmdExecutor : public ViewCmdExecutor {
128128
virtual void AcceptOrDismissAlert(bool accept, Error** error) NOT_SUPPORTED_IMPL;
129129
virtual void SetOrientation(const std::string &orientation, Error **error) NOT_SUPPORTED_IMPL;
130130
virtual void GetOrientation(std::string *orientation, Error **error);
131-
virtual void SetOnline(bool, Error** error) NOT_SUPPORTED_IMPL;
132-
virtual void IsOnline(bool*, Error** error) NOT_SUPPORTED_IMPL;
131+
virtual void SetOnline(bool, Error** error);
132+
virtual void IsOnline(bool*, Error** error);
133133

134134
protected:
135135
QDeclarativeWebView* getView(const ViewId& viewId, Error** error);

src/webdriver/extension_qt/graphics_web_view_executor.cc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,4 +716,17 @@ void GraphicsWebViewCmdExecutor::GetOrientation(std::string *orientation, Error
716716
// TODO:
717717
}
718718

719+
void GraphicsWebViewCmdExecutor::SetOnline(bool online, Error** error) {
720+
CHECK_VIEW_EXISTANCE
721+
722+
*error = webkitProxy_->SetOnline(online);
723+
}
724+
725+
void GraphicsWebViewCmdExecutor::IsOnline(bool* online, Error** error) {
726+
CHECK_VIEW_EXISTANCE
727+
728+
*error = webkitProxy_->IsOnline(online);
729+
}
730+
731+
719732
} // namespace webdriver

src/webdriver/extension_qt/qml_web_view_executor.cc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,4 +724,16 @@ void QmlWebViewCmdExecutor::GetOrientation(std::string *orientation, Error **err
724724
// TODO:
725725
}
726726

727+
void QmlWebViewCmdExecutor::SetOnline(bool online, Error** error) {
728+
CHECK_VIEW_EXISTANCE
729+
730+
*error = webkitProxy_->SetOnline(online);
731+
}
732+
733+
void QmlWebViewCmdExecutor::IsOnline(bool* online, Error** error) {
734+
CHECK_VIEW_EXISTANCE
735+
736+
*error = webkitProxy_->IsOnline(online);
737+
}
738+
727739
} // namespace webdriver

src/webdriver/extension_qt/qwebkit_proxy.cc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,27 @@ Error* QWebkitProxy::GetMute(const ElementId& element, bool* mute) {
10751075
return NULL;
10761076
}
10771077

1078+
Error* QWebkitProxy::SetOnline(bool online) {
1079+
QNetworkAccessManager *manager = page_->networkAccessManager();
1080+
1081+
if (online){
1082+
manager->setNetworkAccessible(QNetworkAccessManager::Accessible);
1083+
} else {
1084+
manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
1085+
}
1086+
return NULL;
1087+
}
1088+
1089+
Error* QWebkitProxy::IsOnline(bool* online) {
1090+
QNetworkAccessManager *manager = page_->networkAccessManager();
1091+
if (manager->networkAccessible() == QNetworkAccessManager::NotAccessible) {
1092+
*online = false;
1093+
} else {
1094+
*online = true;
1095+
}
1096+
return NULL;
1097+
}
1098+
10781099
QWebFrame* QWebkitProxy::GetFrame(QWebPage* page, const FramePath& frame_path) {
10791100
QWebFrame* frame = FindFrameByPath(page->mainFrame(), frame_path);
10801101
if (frame == NULL)

src/webdriver/extension_qt/qwebkit_proxy.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ class QWebkitProxy {
178178
virtual Error* SetPlaybackSpeed(const ElementId& element, const double speed);
179179
virtual Error* SetMute(const ElementId& element, bool mute);
180180
virtual Error* GetMute(const ElementId& element, bool* mute);
181+
virtual Error* SetOnline(bool online);
182+
virtual Error* IsOnline(bool* online);
181183

182184
protected:
183185
Session* session_;

src/webdriver/extension_qt/web_view_executor.cc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -759,22 +759,15 @@ void QWebViewCmdExecutor::VisualizerShowPoint(Error** error) {
759759
}
760760

761761
void QWebViewCmdExecutor::SetOnline(bool online, Error** error) {
762-
QNetworkAccessManager *manager = view_->page()->networkAccessManager();
762+
CHECK_VIEW_EXISTANCE
763763

764-
if (online){
765-
manager->setNetworkAccessible(QNetworkAccessManager::Accessible);
766-
} else {
767-
manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
768-
}
764+
*error = webkitProxy_->SetOnline(online);
769765
}
770766

771767
void QWebViewCmdExecutor::IsOnline(bool* online, Error** error) {
772-
QNetworkAccessManager *manager = view_->page()->networkAccessManager();
773-
if (manager->networkAccessible() == QNetworkAccessManager::NotAccessible) {
774-
*online = false;
775-
} else {
776-
*online = true;
777-
}
768+
CHECK_VIEW_EXISTANCE
769+
770+
*error = webkitProxy_->IsOnline(online);
778771
}
779772

780773

0 commit comments

Comments
 (0)