Title: [86679] trunk/Source/WebCore
- Revision
- 86679
- Author
- [email protected]
- Date
- 2011-05-17 10:13:03 -0700 (Tue, 17 May 2011)
Log Message
2011-05-17 Grace Kloba <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (86678 => 86679)
--- trunk/Source/WebCore/ChangeLog 2011-05-17 17:12:37 UTC (rev 86678)
+++ trunk/Source/WebCore/ChangeLog 2011-05-17 17:13:03 UTC (rev 86679)
@@ -1,3 +1,13 @@
+2011-05-17 Grace Kloba <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp (86678 => 86679)
--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp 2011-05-17 17:12:37 UTC (rev 86678)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp 2011-05-17 17:13:03 UTC (rev 86679)
@@ -34,6 +34,7 @@
#include "Image.h"
#include "ImageSource.h"
#include "NativeImageSkia.h"
+#include "SkColorPriv.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -80,7 +81,8 @@
ASSERT(skiaImage->rowBytes() == skiaImage->width() * 4);
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());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
