Changeset 69777 in webkit

Timestamp:

Oct 14, 2010 10:31:13 AM (14 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2010-10-14 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap] [Qt] Texture mapper initial implementation
​https://bugs.webkit.org/show_bug.cgi?id=47070

Allow rendering of accelerated-compositing with TextureMapper, inside a QWebFrame. The frame will render the regular content,
either normally or through tiled backingstore, then let the TextureMapper layer render itself to the active context, and
then render the scrollbar and pan icon. This is different from the current implementation, which uses additional QGraphicsItems for AC
and the scrollbar overlay.

• Api/qgraphicswebview.cpp: (QGraphicsWebView::paint):
• Api/qwebframe.cpp: (QWebFramePrivate::renderFromTiledBackingStore): (QWebFramePrivate::renderRelativeCoords):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (1 diff)
• Api/qwebframe.cpp (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -298 +298 @@
     } 
 #endif
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
     page()->mainFrame()->render(painter, d->overlay() ? QWebFrame::ContentsLayer : QWebFrame::AllLayers, option->exposedRect.toAlignedRect());
 #else

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -97 +97 @@
 #include "runtime_root.h"
 #endif
+#if USE(TEXTURE_MAPPER)
+#include "texmap/TextureMapperPlatformLayer.h"
+#endif
 #include "wtf/HashMap.h"
 #include <QMultiMap>
@@ -292 +295 @@
         painter->restore();
     }
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+    // TextureMapper might use raw OpenGL or some other backend that requires native painting. On raster this doesn't have any effect.
+    if (rootGraphicsLayer) {
+        painter->beginNativePainting();
+        rootGraphicsLayer->paint(context, view->size(), view->frameRect(), IntRect(clip.boundingRect()), TransformationMatrix(), painter->opacity());
+        painter->endNativePainting();
+    }
+
+    renderRelativeCoords(context, (QWebFrame::RenderLayer)(QWebFrame::ScrollBarLayer | QWebFrame::PanIconLayer), clip);
+#endif
 }
 #endif
@@ -309 +322 @@
     view->updateLayoutAndStyleIfNeededRecursive();
 
-    for (int i = 0; i < vector.size(); ++i) {
-        const QRect& clipRect = vector.at(i);
-
-        QRect intersectedRect = clipRect.intersected(view->frameRect());
-
+    if (layer & QWebFrame::ContentsLayer) {
         painter->save();
-        painter->setClipRect(clipRect, Qt::IntersectClip);
-
-        int x = view->x();
-        int y = view->y();
-
-        if (layer & QWebFrame::ContentsLayer) {
+        for (int i = 0; i < vector.size(); ++i) {
+            const QRect& clipRect = vector.at(i);
+
+            QRect intersectedRect = clipRect.intersected(view->frameRect());
+
+            painter->setClipRect(clipRect, Qt::IntersectClip);
+
+            int x = view->x();
+            int y = view->y();
+
             context->save();
 
@@ -337 +350 @@
             context->restore();
         }
-
-        if (layer & QWebFrame::ScrollBarLayer
-            && !view->scrollbarsSuppressed()
-            && (view->horizontalScrollbar() || view->verticalScrollbar())) {
-            context->save();
-
-            QRect rect = intersectedRect;
-            context->translate(x, y);
-            rect.translate(-x, -y);
-
-            view->paintScrollbars(context, rect);
-
-            context->restore();
+        painter->restore();
+
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+        if (rootGraphicsLayer) {
+            painter->save();
+            painter->beginNativePainting();
+            rootGraphicsLayer->paint(context, view->size(), view->frameRect(), IntRect(clip.boundingRect()),
+                                     TransformationMatrix(), context->platformContext()->opacity());
+            painter->endNativePainting();
+            painter->restore();
         }
+#endif
+    }
+    if (layer & (QWebFrame::PanIconLayer | QWebFrame::ScrollBarLayer)) {
+        for (int i = 0; i < vector.size(); ++i) {
+            const QRect& clipRect = vector.at(i);
+
+            QRect intersectedRect = clipRect.intersected(view->frameRect());
+
+            painter->save();
+            painter->setClipRect(clipRect, Qt::IntersectClip);
+
+            int x = view->x();
+            int y = view->y();
+
+            if (layer & QWebFrame::ScrollBarLayer
+                && !view->scrollbarsSuppressed()
+                && (view->horizontalScrollbar() || view->verticalScrollbar())) {
+                context->save();
+
+                QRect rect = intersectedRect;
+                context->translate(x, y);
+                rect.translate(-x, -y);
+
+                view->paintScrollbars(context, rect);
+
+                context->restore();
+            }
 
 #if ENABLE(PAN_SCROLLING)
-        if (layer & QWebFrame::PanIconLayer)
-            view->paintPanScrollIcon(context);
+            if (layer & QWebFrame::PanIconLayer)
+                view->paintPanScrollIcon(context);
 #endif
 
-        painter->restore();
+            painter->restore();
+        }
     }
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-14  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap] [Qt] Texture mapper initial implementation
+        https://bugs.webkit.org/show_bug.cgi?id=47070
+
+        Allow rendering of accelerated-compositing with TextureMapper, inside a QWebFrame. The frame will render the regular content,
+        either normally or through tiled backingstore, then let the TextureMapper layer render itself to the active context, and
+        then render the scrollbar and pan icon. This is different from the current implementation, which uses additional QGraphicsItems for AC
+        and the scrollbar overlay.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::paint):
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderFromTiledBackingStore):
+        (QWebFramePrivate::renderRelativeCoords):
+
 2010-10-13  Gavin Barraclough  <barraclough@apple.com>