Changeset 86679 in webkit

Timestamp:

May 17, 2011 10:13:03 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-17 Grace Kloba <​klobag@chromium.org>

Reviewed by Kenneth Russell.

GraphicsContext3DSkia needs to honor the platform Sk_x_SHIFT value instead of assuming BGRA color
​https://bugs.webkit.org/show_bug.cgi?id=60965

• platform/graphics/skia/GraphicsContext3DSkia.cpp: (WebCore::GraphicsContext3D::getImageData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GraphicsContext3DSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Grace Kloba  <klobag@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        GraphicsContext3DSkia needs to honor the platform Sk_x_SHIFT value instead of assuming BGRA color
+        https://bugs.webkit.org/show_bug.cgi?id=60965
+
+        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2011-05-17  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

@@ -35 +35 @@
 #include "ImageSource.h"
 #include "NativeImageSkia.h"
+#include "SkColorPriv.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -81 +82 @@
     outputVector.resize(skiaImage->rowBytes() * skiaImage->height());
     return packPixels(reinterpret_cast<const uint8_t*>(skiaImage->getPixels()),
-                      SourceFormatBGRA8, skiaImage->width(), skiaImage->height(), 0,
+                      SK_B32_SHIFT ? SourceFormatRGBA8 : SourceFormatBGRA8,
+                      skiaImage->width(), skiaImage->height(), 0,
                       format, type, neededAlphaOp, outputVector.data());
 }