Bug 97548 – [Qt] r122720 causes performance regression with DirectFB on ARMv7

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Zoltan Horvath]

Commit: http://trac.webkit.org/changeset/122720
Bug: https://bugs.webkit.org/show_bug.cgi?id=88785
Thread about the regression: http://lists.webkit.org/pipermail/webkit-qt/2012-September/003111.html

[Stephane Cerveau]

Created attachment 166428 [details]
Revert patch from july 2012: Change NativeImagePtr from QPixmap* to QImage*

I revert from patch:

- 62cc457176734d84d4827f0e0bf59ed425d7ef7d
- bd883b59bc785c680f03a6c3a1b28cc6ea48390a
- 7a62d58c41f7959a96737d4d65ea129d9f26d3e8
- 2973e24f23a2dd9d5f483f39b77264b791d96fd3 ( main commit)

[Stephane Cerveau]

Created attachment 166467 [details]
update to build with opengl

Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp is now building.
Revert eae63a44dc6d532fa30225ef8ee9335b90ef4475

[Balazs Kelemen]

(In reply to comment #2)
> Created an attachment (id=166467) [details]
> update to build with opengl
> 
> Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp is now building.
> Revert eae63a44dc6d532fa30225ef8ee9335b90ef4475

Why didn't you set it for review (r?)

[Zoltan Horvath]

Created attachment 167495 [details]
proposed revert

[Gyuyoung Kim]

Comment on attachment 167495 [details]
proposed revert

Attachment 167495 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/14196744

[Zoltan Horvath]

Created attachment 167497 [details]
proposed revert, gtk+efl build fixed

[Jocelyn Turcotte]

Comment on attachment 167497 [details]
proposed revert, gtk+efl build fixed

I did the revert locally to have a better idea and this looks good.
One thing is that we might have to apply this extra chunk when we cherry pick this patch to the QtWebKit 2.3 branch:

--- b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -491,13 +491,8 @@
         qtImage = QImage::fromData(reinterpret_cast<const uchar*>(image->data()->data()), image->data()->size());
     else {
         QPixmap* nativePixmap = image->nativeImageForCurrentFrame();
-#if HAVE(QT5)
         // With QPA, we can avoid a deep copy.
         qtImage = *nativePixmap->handle()->buffer();
-#else
-        // This might be a deep copy, depending on other references to the pixmap.
-        qtImage = nativePixmap->toImage();
-#endif
     }
 
     AlphaOp alphaOp = AlphaDoNothing;

[WebKit Review Bot]

Comment on attachment 167497 [details]
proposed revert, gtk+efl build fixed

Clearing flags on attachment: 167497

Committed r130636: <http://trac.webkit.org/changeset/130636>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.