Title: [135839] trunk/Source/WebCore
- Revision
- 135839
- Author
- [email protected]
- Date
- 2012-11-27 02:27:16 -0800 (Tue, 27 Nov 2012)
Log Message
REGRESSION(134887) [Qt][EFL][WK2] Repaint counter not working
https://bugs.webkit.org/show_bug.cgi?id=103261
Reviewed by Noam Rosenthal.
Fixed regression introduced in 134887, which introduced the
updateContentsNoSwizzle method and called it directly from
the repaint counter.
This method obviously needs to bind the texture.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::BitmapTextureGL::updateContentsNoSwizzle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135838 => 135839)
--- trunk/Source/WebCore/ChangeLog 2012-11-27 10:05:44 UTC (rev 135838)
+++ trunk/Source/WebCore/ChangeLog 2012-11-27 10:27:16 UTC (rev 135839)
@@ -1,3 +1,19 @@
+2012-11-27 Kenneth Rohde Christiansen <[email protected]>
+
+ REGRESSION(134887) [Qt][EFL][WK2] Repaint counter not working
+ https://bugs.webkit.org/show_bug.cgi?id=103261
+
+ Reviewed by Noam Rosenthal.
+
+ Fixed regression introduced in 134887, which introduced the
+ updateContentsNoSwizzle method and called it directly from
+ the repaint counter.
+
+ This method obviously needs to bind the texture.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::BitmapTextureGL::updateContentsNoSwizzle):
+
2012-11-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r135786.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (135838 => 135839)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-11-27 10:05:44 UTC (rev 135838)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-11-27 10:27:16 UTC (rev 135839)
@@ -691,6 +691,7 @@
void BitmapTextureGL::updateContentsNoSwizzle(const void* srcData, const IntRect& targetRect, const IntPoint& sourceOffset, int bytesPerLine, unsigned bytesPerPixel, Platform3DObject glFormat)
{
+ m_context3D->bindTexture(GraphicsContext3D::TEXTURE_2D, m_id);
#if !defined(TEXMAP_OPENGL_ES_2)
if (driverSupportsSubImage()) { // For ES drivers that don't support sub-images.
// Use the OpenGL sub-image extension, now that we know it's available.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
