[webkit-changes] [119231] trunk/Source/WebKit2

[commit-queue]

Title: [119231] trunk/Source/WebKit2

Revision

119231

Author

commit-qu...@webkit.org

Date

2012-06-01 08:21:20 -0700 (Fri, 01 Jun 2012)

Log Message

[Qt][WK2] Contents not rendered in MiniBrowser for some pages
https://bugs.webkit.org/show_bug.cgi?id=87922

Patch by Dinu Jacob <dinu.ja...@nokia.com> on 2012-06-01
Reviewed by Kenneth Rohde Christiansen.

Set drawing area visible contents rect if new visible contents rect is different from
the previous one.

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::informVisibleContentChange):
* UIProcess/qt/QtViewportInteractionEngine.h:
(QtViewportInteractionEngine):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
• trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h

Diff

Modified: trunk/Source/WebKit2/ChangeLog (119230 => 119231)

--- trunk/Source/WebKit2/ChangeLog	2012-06-01 14:36:24 UTC (rev 119230)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-01 15:21:20 UTC (rev 119231)
@@ -1,3 +1,18 @@
+2012-06-01  Dinu Jacob  <dinu.ja...@nokia.com>
+
+        [Qt][WK2] Contents not rendered in MiniBrowser for some pages
+        https://bugs.webkit.org/show_bug.cgi?id=87922
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Set drawing area visible contents rect if new visible contents rect is different from
+        the previous one.
+
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::QtViewportInteractionEngine::informVisibleContentChange):
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        (QtViewportInteractionEngine):
+
 2012-06-01  Kenneth Rohde Christiansen  <kenn...@webkit.org>
 
         [Qt] Move suspension to QtViewportInteractionEngine

Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (119230 => 119231)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-06-01 14:36:24 UTC (rev 119230)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-06-01 15:21:20 UTC (rev 119231)
@@ -703,11 +703,15 @@
     if (!drawingArea)
         return;
 
+    if (m_lastVisibleContentsRect == visibleContentsRect())
+        return;
+
     qreal scale = m_pageItem->contentsScale();
 
     if (scale != m_lastCommittedScale)
         emit m_viewportItem->experimental()->test()->contentsScaleCommitted();
     m_lastCommittedScale = scale;
+    m_lastVisibleContentsRect = visibleContentsRect();
 
     drawingArea->setVisibleContentsRect(visibleContentsRect(), scale, trajectoryVector, m_viewportItem->contentPos());
 

Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (119230 => 119231)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-06-01 14:36:24 UTC (rev 119230)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-06-01 15:21:20 UTC (rev 119231)
@@ -166,6 +166,7 @@
     QPointF m_lastScrollPosition;
     qreal m_pinchStartScale;
     qreal m_lastCommittedScale;
+    QRectF m_lastVisibleContentsRect;
     qreal m_zoomOutScale;
     QList<ScaleStackItem> m_scaleStack;
 };

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes