Skip to content

Commit 58a9d95

Browse files
committed
added view handle for Quick1 WebView
1 parent ec7bf47 commit 58a9d95

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#ifndef WEBDRIVER_QT_DECLARATIVE_ITEM_VIEW_H_
2+
#define WEBDRIVER_QT_DECLARATIVE_ITEM_VIEW_H_
3+
4+
#include <string>
5+
6+
#include "webdriver_view_id.h"
7+
8+
#include <QtDeclarative/QDeclarativeItem>
9+
#include <QtCore/QPointer>
10+
#include <QtCore/QtGlobal>
11+
12+
namespace webdriver {
13+
14+
class QDeclarativeItemViewHandle : public ViewHandle {
15+
public:
16+
QDeclarativeItemViewHandle();
17+
QDeclarativeItemViewHandle(QDeclarativeItem* view);
18+
19+
virtual bool is_valid() const { return !view_.isNull(); };
20+
virtual bool equals(const ViewHandle* other) const;
21+
QDeclarativeItem* get() { return view_.data(); };
22+
23+
protected:
24+
QPointer<QDeclarativeItem> view_;
25+
//private:
26+
virtual ~QDeclarativeItemViewHandle() {};
27+
};
28+
29+
} // namespace webdriver
30+
31+
#endif // WEBDRIVER_QT_DECLARATIVE_ITEM_VIEW_H_
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#include "extension_qt/declarative_item_view_handle.h"
2+
3+
namespace webdriver {
4+
5+
QDeclarativeItemViewHandle::QDeclarativeItemViewHandle()
6+
: view_((QDeclarativeItem*)NULL) { }
7+
8+
QDeclarativeItemViewHandle::QDeclarativeItemViewHandle(QDeclarativeItem* view)
9+
: view_(view) { }
10+
11+
bool QDeclarativeItemViewHandle::equals(const ViewHandle* other) const {
12+
const QDeclarativeItemViewHandle* toCompare = dynamic_cast<const QDeclarativeItemViewHandle*>(other);
13+
if (NULL == toCompare) return false;
14+
15+
return view_ == toCompare->view_;
16+
}
17+
18+
} // namespace webdriver

wd_ext_qt.gyp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'src/vnc/vncserverparameters.cc',
5454
'src/webdriver/extension_qt/vnc_event_dispatcher.cc',
5555
'src/webdriver/extension_qt/wd_event_dispatcher.cc',
56-
'src/webdriver/extension_qt/uinput_event_dispatcher.cc',
56+
'src/webdriver/extension_qt/uinput_event_dispatcher.cc',
5757
'src/third_party/pugixml/pugixml.cpp'
5858
],
5959

@@ -97,6 +97,7 @@
9797
} , {
9898

9999
'sources': [
100+
'src/webdriver/extension_qt/declarative_item_view_handle.cc',
100101
'src/webdriver/extension_qt/qml_view_creator.cc',
101102
'src/webdriver/extension_qt/qml_view_enumerator.cc',
102103
'src/webdriver/extension_qt/qml_view_executor.cc',

0 commit comments

Comments
 (0)