Changeset 67688 in webkit

Timestamp:

Sep 16, 2010 6:33:44 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-09-12 Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Andreas Kling.

Make all accesses to m_item (GraphicsWebView) done by WebViewGraphicsBased class happen though graphicsWebView getter method.

This patch is mostly a preparation for another commit, where the ownership of the m_item/GraphicsWebView
object will move to the qgraphicsscene instead of the qgraphicsview.

• QtTestBrowser/webview.cpp: (WebViewGraphicsBased::setPage): (WebViewGraphicsBased::setResizesToContents): (WebViewGraphicsBased::resizeEvent): (WebViewGraphicsBased::animatedFlip):
• QtTestBrowser/webview.h: (WebViewGraphicsBased::setItemCacheMode): (WebViewGraphicsBased::itemCacheMode):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/webview.cpp (modified) (5 diffs)
• QtTestBrowser/webview.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-12  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Make all accesses to m_item (GraphicsWebView) done by WebViewGraphicsBased class happen though graphicsWebView getter method.
+
+        This patch is mostly a preparation for another commit, where the ownership of the m_item/GraphicsWebView
+        object will move to the qgraphicsscene instead of the qgraphicsview.
+
+        * QtTestBrowser/webview.cpp:
+        (WebViewGraphicsBased::setPage):
+        (WebViewGraphicsBased::setResizesToContents):
+        (WebViewGraphicsBased::resizeEvent):
+        (WebViewGraphicsBased::animatedFlip):
+        * QtTestBrowser/webview.h:
+        (WebViewGraphicsBased::setItemCacheMode):
+        (WebViewGraphicsBased::itemCacheMode):
+
 2010-09-12  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/QtTestBrowser/webview.cpp

@@ -60 +60 @@
 {
     connect(page->mainFrame(), SIGNAL(contentsSizeChanged(const QSize&)), SLOT(contentsSizeChanged(const QSize&)));
-    m_item->setPage(page);
+    graphicsWebView()->setPage(page);
 }
 
@@ -75 +75 @@
 
     m_resizesToContents = b;
-    m_item->setResizesToContents(m_resizesToContents);
+    graphicsWebView()->setResizesToContents(m_resizesToContents);
 
     // When setting resizesToContents ON, our web view widget will always size as big as the
@@ -95 +95 @@
         setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-        m_item->page()->setPreferredContentsSize(size());
-        QRectF itemRect(m_item->geometry().topLeft(), m_item->page()->mainFrame()->contentsSize());
-        m_item->setGeometry(itemRect);
+        graphicsWebView()->page()->setPreferredContentsSize(size());
+        QRectF itemRect(graphicsWebView()->geometry().topLeft(), graphicsWebView()->page()->mainFrame()->contentsSize());
+        graphicsWebView()->setGeometry(itemRect);
         scene()->setSceneRect(itemRect);
     } else {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        m_item->page()->setPreferredContentsSize(QSize());
+        graphicsWebView()->page()->setPreferredContentsSize(QSize());
         QRect viewportRect(QPoint(0, 0), size());
-        m_item->setGeometry(viewportRect);
+        graphicsWebView()->setGeometry(viewportRect);
         scene()->setSceneRect(viewportRect);
     }
@@ -116 +116 @@
 
     if (m_resizesToContents) {
-        m_item->page()->setPreferredContentsSize(size);
+        graphicsWebView()->page()->setPreferredContentsSize(size);
         return;
     }
 
     QRectF rect(QPoint(0, 0), size);
-    m_item->setGeometry(rect);
+    graphicsWebView()->setGeometry(rect);
     scene()->setSceneRect(rect);
 }
@@ -153 +153 @@
 {
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    QSizeF center = m_item->boundingRect().size() / 2;
+    QSizeF center = graphicsWebView()->boundingRect().size() / 2;
     QPointF centerPoint = QPointF(center.width(), center.height());
-    m_item->setTransformOriginPoint(centerPoint);
-
-    QPropertyAnimation* animation = new QPropertyAnimation(m_item, "rotation", this);
+    graphicsWebView()->setTransformOriginPoint(centerPoint);
+
+    QPropertyAnimation* animation = new QPropertyAnimation(graphicsWebView(), "rotation", this);
     animation->setDuration(1000);
 
-    int rotation = int(m_item->rotation());
+    int rotation = int(graphicsWebView()->rotation());
 
     animation->setStartValue(rotation);

trunk/WebKitTools/QtTestBrowser/webview.h

@@ -76 +76 @@
     void setPage(QWebPage* page);
 
-    void setItemCacheMode(QGraphicsItem::CacheMode mode) { m_item->setCacheMode(mode); }
-    QGraphicsItem::CacheMode itemCacheMode() { return m_item->cacheMode(); }
+    void setItemCacheMode(QGraphicsItem::CacheMode mode) { graphicsWebView()->setCacheMode(mode); }
+    QGraphicsItem::CacheMode itemCacheMode() { return graphicsWebView()->cacheMode(); }
 
     void setFrameRateMeasurementEnabled(bool enabled);