Title: [152531] trunk/Source/WebCore
- Revision
- 152531
- Author
- [email protected]
- Date
- 2013-07-10 01:46:19 -0700 (Wed, 10 Jul 2013)
Log Message
REGRESSION(r151957): WebGL textures do not show
https://bugs.webkit.org/show_bug.cgi?id=118464
Reviewed by Christophe Dumez.
After r151957 decoder.frameIsCompleteAtIndex(0) doesn't trigger image decoding,
we have to call decoder.createFrameAtIndex(0) explicitly to ensure it.
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
(WebCore::GraphicsContext3D::ImageExtractor::extractImage):
* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::ImageExtractor::extractImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152530 => 152531)
--- trunk/Source/WebCore/ChangeLog 2013-07-10 08:41:14 UTC (rev 152530)
+++ trunk/Source/WebCore/ChangeLog 2013-07-10 08:46:19 UTC (rev 152531)
@@ -1,3 +1,18 @@
+2013-07-10 Csaba Osztrogonác <[email protected]>
+
+ REGRESSION(r151957): WebGL textures do not show
+ https://bugs.webkit.org/show_bug.cgi?id=118464
+
+ Reviewed by Christophe Dumez.
+
+ After r151957 decoder.frameIsCompleteAtIndex(0) doesn't trigger image decoding,
+ we have to call decoder.createFrameAtIndex(0) explicitly to ensure it.
+
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+ (WebCore::GraphicsContext3D::ImageExtractor::extractImage):
+ * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+ (WebCore::GraphicsContext3D::ImageExtractor::extractImage):
+
2013-07-10 Karol Świniarski <[email protected]>
Change recently ratified extensions prefixes from WEBKIT_WEBGL_ to WEBGL_
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (152530 => 152531)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2013-07-10 08:41:14 UTC (rev 152530)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2013-07-10 08:46:19 UTC (rev 152531)
@@ -190,9 +190,12 @@
m_alphaOp = AlphaDoNothing;
if (m_image->data()) {
decoder.setData(m_image->data(), true);
- if (!decoder.frameCount() || !decoder.frameIsCompleteAtIndex(0))
+ if (!decoder.frameCount())
return false;
+
m_imageSurface = decoder.createFrameAtIndex(0);
+ if (!m_imageSurface || !decoder.frameIsCompleteAtIndex(0))
+ return false;
} else {
m_imageSurface = m_image->nativeImageForCurrentFrame();
// 1. For texImage2D with HTMLVideoElment input, assume no PremultiplyAlpha had been applied and the alpha value is 0xFF for each pixel,
Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (152530 => 152531)
--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2013-07-10 08:41:14 UTC (rev 152530)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2013-07-10 08:46:19 UTC (rev 152531)
@@ -265,10 +265,12 @@
if (m_image->data()) {
decoder.setData(m_image->data(), true);
- if (!decoder.frameCount() || !decoder.frameIsCompleteAtIndex(0))
+ if (!decoder.frameCount())
return false;
m_imageSurface = decoder.createFrameAtIndex(0);
+ if (!m_imageSurface || !decoder.frameIsCompleteAtIndex(0))
+ return false;
} else {
m_imageSurface = m_image->nativeImageForCurrentFrame();
// 1. For texImage2D with HTMLVideoElment input, assume no PremultiplyAlpha had been applied and the alpha value is 0xFF for each pixel,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
