Changeset 108915 in webkit

Timestamp:

Feb 25, 2012 4:28:26 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r108900.
​http://trac.webkit.org/changeset/108900
​https://bugs.webkit.org/show_bug.cgi?id=79587

broke some API tests, will investigate and re-commit
(Requested by noamr on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-02-25

• UIProcess/API/qt/qquickwebpage.cpp:

(computeEffectiveOpacity):
(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-02-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r108900.
+        http://trac.webkit.org/changeset/108900
+        https://bugs.webkit.org/show_bug.cgi?id=79587
+
+        broke some API tests, will investigate and re-commit
+        (Requested by noamr on #webkit).
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        (computeEffectiveOpacity):
+        (QQuickWebPagePrivate::paintToCurrentGLContext):
+        (PageProxyNode::changedStates):
+        (PageProxyNode::render):
+        * UIProcess/API/qt/qquickwebpage_p_p.h:
+        (QQuickWebPagePrivate):
+
 2012-02-25  No'am Rosenthal  <noam.rosenthal@nokia.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)
 {
@@ -78 +90 @@
 }
 
-void QQuickWebPagePrivate::paintToCurrentGLContext(const QTransform& transform, float opacity)
+void QQuickWebPagePrivate::paintToCurrentGLContext()
 {
     if (!q->isVisible())
         return;
 
+    QTransform transform = q->itemTransform(0, 0);
+    transform.scale(contentsScale, contentsScale);
+
+    float opacity = computeEffectiveOpacity(q);
     QRectF clipRect = viewportItem->mapRectToScene(viewportItem->boundingRect());
 
@@ -92 +108 @@
         return;
 
-    drawingArea->paintToCurrentGLContext(QTransform(transform).scale(contentsScale, contentsScale), opacity, clipRect);
+    drawingArea->paintToCurrentGLContext(transform, opacity, clipRect);
 }
 
@@ -103 +119 @@
     virtual StateFlags changedStates()
     {
-        return StateFlags(StencilState) | ColorState | BlendState;
-    }
-
-    virtual void render(const RenderState&)
+        return StateFlags(DepthState) | StencilState | ScissorState | ColorState | BlendState
+               | CullState | ViewportState;
+    }
+
+    virtual void render(const RenderState &)
     {
         if (m_pagePrivate)
-            m_pagePrivate->paintToCurrentGLContext(matrix()->toTransform(), inheritedOpacity());
+            m_pagePrivate->paintToCurrentGLContext();
     }
 

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

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