Changeset 109664 in webkit

Timestamp:

Mar 3, 2012 11:26:39 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt] Use the existing inheritedOpacity/matrix properties of QSGNode
​https://bugs.webkit.org/show_bug.cgi?id=79543

Use QSGNode::inheritedOpacity() and QSGNode::matrix().
Also, remove flags from changedStates() that we don't actually touch.
This is covered by existing API tests.

Reviewed by Kenneth Rohde Christiansen.

• UIProcess/API/qt/qquickwebpage.cpp:

(QQuickWebPagePrivate::paintToCurrentGLContext):
(PageProxyNode::changedStates):
(PageProxyNode::render):

• UIProcess/API/qt/qquickwebpage_p_p.h:

(QQuickWebPagePrivate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebpage.cpp (modified) (4 diffs)
• UIProcess/API/qt/qquickwebpage_p_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-03  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt] Use the existing inheritedOpacity/matrix properties of QSGNode
+        https://bugs.webkit.org/show_bug.cgi?id=79543
+
+        Use QSGNode::inheritedOpacity() and QSGNode::matrix().
+        Also, remove flags from changedStates() that we don't actually touch.
+        This is covered by existing API tests.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        (QQuickWebPagePrivate::paintToCurrentGLContext):
+        (PageProxyNode::changedStates):
+        (PageProxyNode::render):
+        * UIProcess/API/qt/qquickwebpage_p_p.h:
+        (QQuickWebPagePrivate):
+
 2012-03-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp

@@ -64 +64 @@
 }
 
-static float computeEffectiveOpacity(const QQuickItem* item)
-{
-    if (!item)
-        return 1;
-
-    float opacity = item->opacity();
-    if (opacity < 0.01)
-        return 0;
-
-    return opacity * computeEffectiveOpacity(item->parentItem());
-}
-
 void QQuickWebPagePrivate::setDrawingAreaSize(const QSize& size)
 {
@@ -90 +78 @@
 }
 
-void QQuickWebPagePrivate::paintToCurrentGLContext()
+void QQuickWebPagePrivate::paintToCurrentGLContext(const QTransform& transform, float opacity)
 {
     if (!q->isVisible())
         return;
 
-    QTransform transform = q->itemTransform(0, 0);
-    transform.scale(contentsScale, contentsScale);
-
-    float opacity = computeEffectiveOpacity(q);
     QRectF clipRect = viewportItem->mapRectToScene(viewportItem->boundingRect());
 
@@ -108 +92 @@
         return;
 
-    drawingArea->paintToCurrentGLContext(transform, opacity, clipRect);
+    drawingArea->paintToCurrentGLContext(QTransform(transform).scale(contentsScale, contentsScale), opacity, clipRect);
 }
 
@@ -119 +103 @@
     virtual StateFlags changedStates()
     {
-        return StateFlags(DepthState) | StencilState | ScissorState | ColorState | BlendState
-               | CullState | ViewportState;
-    }
-
-    virtual void render(const RenderState &)
-    {
-        if (m_pagePrivate)
-            m_pagePrivate->paintToCurrentGLContext();
+        return StateFlags(StencilState) | ColorState | BlendState;
+    }
+
+    virtual void render(const RenderState&)
+    {
+        if (!m_pagePrivate)
+            return;
+        QTransform transform = matrix() ? matrix()->toTransform() : QTransform();
+        m_pagePrivate->paintToCurrentGLContext(transform, inheritedOpacity());
     }
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h

@@ -42 +42 @@
     void updateSize();
 
-    void paintToCurrentGLContext();
+    void paintToCurrentGLContext(const QTransform&, float opacity);
     void paint(QPainter*);
     void resetPaintNode();