Title: [101165] trunk/Source/WebKit2
- Revision
- 101165
- Author
- [email protected]
- Date
- 2011-11-25 04:54:15 -0800 (Fri, 25 Nov 2011)
Log Message
[Qt] Eliminate warnings about the deprecated QQuickCanvas::sceneGraphEngine() function.
Reviewed by Andreas Kling.
We use the function in question to find out if we can connect to the scene graph's
afterRendering signal. The signal has been moved into QQuickCanvas right away, so
we can connect to it as soon as we have a canvas.
* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPagePrivate::initializeSceneGraphConnections):
* UIProcess/API/qt/qquickwebpage_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (101164 => 101165)
--- trunk/Source/WebKit2/ChangeLog 2011-11-25 12:48:49 UTC (rev 101164)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-25 12:54:15 UTC (rev 101165)
@@ -1,3 +1,17 @@
+2011-11-25 Simon Hausmann <[email protected]>
+
+ [Qt] Eliminate warnings about the deprecated QQuickCanvas::sceneGraphEngine() function.
+
+ Reviewed by Andreas Kling.
+
+ We use the function in question to find out if we can connect to the scene graph's
+ afterRendering signal. The signal has been moved into QQuickCanvas right away, so
+ we can connect to it as soon as we have a canvas.
+
+ * UIProcess/API/qt/qquickwebpage.cpp:
+ (QQuickWebPagePrivate::initializeSceneGraphConnections):
+ * UIProcess/API/qt/qquickwebpage_p.h:
+
2011-11-24 Jesus Sanchez-Palencia <[email protected]>
[Qt][WK2] Move event handling out of QtWebPageProxy
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (101164 => 101165)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-11-25 12:48:49 UTC (rev 101164)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-11-25 12:54:15 UTC (rev 101165)
@@ -28,7 +28,6 @@
#include "qquickwebview_p.h"
#include <QtCore/QUrl>
#include <QtDeclarative/QQuickCanvas>
-#include <QtDeclarative/QSGEngine>
QQuickWebPage::QQuickWebPage(QQuickItem* parent)
: QQuickItem(parent)
@@ -181,10 +180,7 @@
if (!q->canvas())
return;
paintingIsInitialized = true;
- if (q->sceneGraphEngine())
- _q_onSceneGraphInitialized();
- else
- QObject::connect(q->canvas(), SIGNAL(sceneGraphInitialized()), q, SLOT(_q_onSceneGraphInitialized()));
+ QObject::connect(q->canvas(), SIGNAL(afterRendering()), q, SLOT(_q_onAfterSceneRender()), Qt::DirectConnection);
}
void QQuickWebPagePrivate::setPageProxy(QtWebPageProxy* pageProxy)
@@ -243,10 +239,4 @@
paintToCurrentGLContext();
}
-void QQuickWebPagePrivate::_q_onSceneGraphInitialized()
-{
- QSGEngine* engine = q->sceneGraphEngine();
- QObject::connect(engine, SIGNAL(afterRendering()), q, SLOT(_q_onAfterSceneRender()), Qt::DirectConnection);
-}
-
#include "moc_qquickwebpage_p.cpp"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h (101164 => 101165)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-11-25 12:48:49 UTC (rev 101164)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-11-25 12:54:15 UTC (rev 101165)
@@ -69,7 +69,6 @@
private:
Q_PRIVATE_SLOT(d, void _q_onAfterSceneRender());
- Q_PRIVATE_SLOT(d, void _q_onSceneGraphInitialized());
QQuickWebPagePrivate* d;
friend class QQuickWebView;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
