[webkit-reviews] review granted: [Bug 97548] [Qt] r122720 causes performance regression with DirectFB on ARMv7 : [Attachment 167497] proposed revert, gtk+efl build fixed

[bugzilla-daemon at webkit.org]

Jocelyn Turcotte <jocelyn.turcotte at digia.com> has granted Zoltan Horvath
<zoltan at webkit.org>'s request for review:
Bug 97548: [Qt] r122720 causes performance regression with DirectFB on ARMv7
https://bugs.webkit.org/show_bug.cgi?id=97548

Attachment 167497: proposed revert, gtk+efl build fixed
https://bugs.webkit.org/attachment.cgi?id=167497&action=review

------- Additional Comments from Jocelyn Turcotte <jocelyn.turcotte at digia.com>
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;