Title: [89384] trunk/Source/WebKit2
- Revision
- 89384
- Author
- yael.aha...@nokia.com
- Date
- 2011-06-21 14:31:56 -0700 (Tue, 21 Jun 2011)
Log Message
[Qt] Add an internal API for accessing the QGraphicsView.
https://bugs.webkit.org/show_bug.cgi?id=63095
Reviewed by Kenneth Rohde Christiansen.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::ownerWidget):
* UIProcess/API/qt/qwkpage_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89383 => 89384)
--- trunk/Source/WebKit2/ChangeLog 2011-06-21 21:20:15 UTC (rev 89383)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-21 21:31:56 UTC (rev 89384)
@@ -1,3 +1,14 @@
+2011-06-21 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Add an internal API for accessing the QGraphicsView.
+ https://bugs.webkit.org/show_bug.cgi?id=63095
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::ownerWidget):
+ * UIProcess/API/qt/qwkpage_p.h:
+
2011-06-21 Lukasz Slachciak <l.slachc...@samsung.com>
Reviewed by Sam Weinig.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp (89383 => 89384)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp 2011-06-21 21:20:15 UTC (rev 89383)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp 2011-06-21 21:31:56 UTC (rev 89384)
@@ -306,6 +306,18 @@
notImplemented();
}
+QWidget* QWKPagePrivate::ownerWidget()
+{
+ if (!view || !view->scene() || view->scene()->views().isEmpty())
+ return 0;
+
+ QList<QGraphicsView*> views = view->scene()->views();
+ if (views.size() > 1)
+ qWarning("Cannot support multiple views");
+
+ return views.at(0);
+}
+
void QWKPagePrivate::paint(QPainter* painter, QRect area)
{
if (page->isValid() && page->drawingArea()) {
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h (89383 => 89384)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h 2011-06-21 21:20:15 UTC (rev 89383)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h 2011-06-21 21:31:56 UTC (rev 89384)
@@ -116,6 +116,8 @@
void updateNavigationActions();
void updateEditorActions();
+ QWidget* ownerWidget();
+
void _q_webActionTriggered(bool checked);
void touchEvent(QTouchEvent*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes