Title: [136859] trunk/Source/WebKit2
- Revision
- 136859
- Author
- [email protected]
- Date
- 2012-12-06 11:21:14 -0800 (Thu, 06 Dec 2012)
Log Message
[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
https://bugs.webkit.org/show_bug.cgi?id=104269
Unreviewed, trivialy fixing last minute change.
Move signal emission to the correct place.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::onComponentComplete):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136858 => 136859)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 19:21:14 UTC (rev 136859)
@@ -3,6 +3,20 @@
[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
https://bugs.webkit.org/show_bug.cgi?id=104269
+ Unreviewed, trivialy fixing last minute change.
+
+ Move signal emission to the correct place.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::onComponentComplete):
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ (WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
+
+2012-12-06 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
+ https://bugs.webkit.org/show_bug.cgi?id=104269
+
Reviewed by Kenneth Rohde Christiansen.
Since the ViewportInfoItem of MiniBrowser is created before the
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (136858 => 136859)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-12-06 19:21:14 UTC (rev 136859)
@@ -868,6 +868,11 @@
m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), m_pageViewportControllerClient.data()));
pageView->eventHandler()->setViewportController(m_pageViewportControllerClient.data());
+ // Notify about device pixel ratio here because due to the delayed instantiation
+ // of the viewport controller the correct value might not have reached QWebKitTest
+ // in time it was used from QML.
+ emit experimental->test()->devicePixelRatioChanged();
+
// Trigger setting of correct visibility flags after everything was allocated and initialized.
_q_onVisibleChanged();
}
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (136858 => 136859)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-12-06 19:21:14 UTC (rev 136859)
@@ -59,11 +59,6 @@
connect(m_scaleAnimation, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)),
SLOT(scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
-
- // Notify about device pixel ratio here because due to the delayed instantiation
- // of the viewport controller the correct value might not have reached QWebKitTest
- // in time it was used from QML.
- emit m_viewportItem->experimental()->test()->devicePixelRatioChanged();
}
void PageViewportControllerClientQt::ScaleAnimation::updateCurrentValue(const QVariant& value)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
