Title: [93743] trunk/Source/WebCore
- Revision
- 93743
- Author
- [email protected]
- Date
- 2011-08-24 15:09:57 -0700 (Wed, 24 Aug 2011)
Log Message
[chromium] Don't call glDeleteTexture(0) in TextureManager
https://bugs.webkit.org/show_bug.cgi?id=66862
Delete(0) is allowed in standard OpenGL, but not in Chrome.
See http://code.google.com/p/chromium/issues/detail?id=85268
Patch by Iain Merrick <[email protected]> on 2011-08-24
Reviewed by James Robinson.
* platform/graphics/chromium/TextureManager.cpp:
(WebCore::TextureManager::deleteEvictedTextures):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93742 => 93743)
--- trunk/Source/WebCore/ChangeLog 2011-08-24 22:07:35 UTC (rev 93742)
+++ trunk/Source/WebCore/ChangeLog 2011-08-24 22:09:57 UTC (rev 93743)
@@ -1,3 +1,16 @@
+2011-08-24 Iain Merrick <[email protected]>
+
+ [chromium] Don't call glDeleteTexture(0) in TextureManager
+ https://bugs.webkit.org/show_bug.cgi?id=66862
+
+ Delete(0) is allowed in standard OpenGL, but not in Chrome.
+ See http://code.google.com/p/chromium/issues/detail?id=85268
+
+ Reviewed by James Robinson.
+
+ * platform/graphics/chromium/TextureManager.cpp:
+ (WebCore::TextureManager::deleteEvictedTextures):
+
2011-08-24 Adrienne Walker <[email protected]>
[chromium] Properly initialize CCTiledLayerImpl::m_skipsDraw
Modified: trunk/Source/WebCore/platform/graphics/chromium/TextureManager.cpp (93742 => 93743)
--- trunk/Source/WebCore/platform/graphics/chromium/TextureManager.cpp 2011-08-24 22:07:35 UTC (rev 93742)
+++ trunk/Source/WebCore/platform/graphics/chromium/TextureManager.cpp 2011-08-24 22:09:57 UTC (rev 93743)
@@ -134,8 +134,10 @@
void TextureManager::deleteEvictedTextures(GraphicsContext3D* context)
{
ASSERT(context == m_associatedContextDebugOnly);
- for (size_t i = 0; i < m_evictedTextureIds.size(); ++i)
- GLC(context, context->deleteTexture(m_evictedTextureIds[i]));
+ for (size_t i = 0; i < m_evictedTextureIds.size(); ++i) {
+ if (m_evictedTextureIds[i])
+ GLC(context, context->deleteTexture(m_evictedTextureIds[i]));
+ }
m_evictedTextureIds.clear();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
