Title: [119234] trunk/Source/WebKit2
- Revision
- 119234
- Author
- [email protected]
- Date
- 2012-06-01 08:43:03 -0700 (Fri, 01 Jun 2012)
Log Message
[Qt] Remove QtViewportInteractionEngine::pageItemSizeChanged.
https://bugs.webkit.org/show_bug.cgi?id=88082
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-06-01
Reviewed by Kenneth Rohde Christiansen.
The function was causing flickering, and after testing it was verified
that it was no longer needed either.
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
* UIProcess/qt/QtViewportInteractionEngine.h:
(QtViewportInteractionEngine):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119233 => 119234)
--- trunk/Source/WebKit2/ChangeLog 2012-06-01 15:38:07 UTC (rev 119233)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-01 15:43:03 UTC (rev 119234)
@@ -1,3 +1,18 @@
+2012-06-01 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Remove QtViewportInteractionEngine::pageItemSizeChanged.
+ https://bugs.webkit.org/show_bug.cgi?id=88082
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ The function was causing flickering, and after testing it was verified
+ that it was no longer needed either.
+
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ (WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
+ * UIProcess/qt/QtViewportInteractionEngine.h:
+ (QtViewportInteractionEngine):
+
2012-06-01 Dinu Jacob <[email protected]>
[Qt][WK2] Contents not rendered in MiniBrowser for some pages
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (119233 => 119234)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-06-01 15:38:07 UTC (rev 119233)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-06-01 15:43:03 UTC (rev 119234)
@@ -163,8 +163,6 @@
, m_lastCommittedScale(-1)
, m_zoomOutScale(0.0)
{
- connect(m_pageItem, SIGNAL(widthChanged()), SLOT(pageItemSizeChanged()), Qt::DirectConnection);
- connect(m_pageItem, SIGNAL(heightChanged()), SLOT(pageItemSizeChanged()), Qt::DirectConnection);
connect(m_viewportItem, SIGNAL(movementStarted()), SLOT(flickMoveStarted()), Qt::DirectConnection);
connect(m_viewportItem, SIGNAL(movementEnded()), SLOT(flickMoveEnded()), Qt::DirectConnection);
@@ -738,21 +736,6 @@
informVisibleContentChange(QPointF());
}
-/*
- * This is called for all changes of item scale, width or height.
- * This is called when interacting, ie. during for instance pinch-zooming.
- *
- * FIXME: This is currently called twice if you concurrently change width and height.
- */
-void QtViewportInteractionEngine::pageItemSizeChanged()
-{
- if (m_suspendCount)
- return;
-
- ViewportUpdateDeferrer guard(this);
- setPageItemRectVisible(nearestValidBounds());
-}
-
void QtViewportInteractionEngine::scaleContent(const QPointF& centerInCSSCoordinates, qreal cssScale)
{
QPointF oldPinchCenterOnViewport = m_viewportItem->mapFromWebContent(centerInCSSCoordinates);
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (119233 => 119234)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h 2012-06-01 15:38:07 UTC (rev 119233)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h 2012-06-01 15:43:03 UTC (rev 119234)
@@ -82,8 +82,7 @@
void pageContentsSizeChanged(const QSize& newSize, const QSize& viewportSize);
private Q_SLOTS:
- // Respond to changes of content that are not driven by us, like the page resizing itself.
- void pageItemSizeChanged();
+ // Respond to changes of position that are not driven by us.
void pageItemPositionChanged();
void scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
