Title: [121267] trunk/Source/WebCore
- Revision
- 121267
- Author
- [email protected]
- Date
- 2012-06-26 10:56:46 -0700 (Tue, 26 Jun 2012)
Log Message
[chromium] Add the workaround of IOSurface-related corruption during readback on Mac OS X.
https://bugs.webkit.org/show_bug.cgi?id=89797
Patch by Yasuhiro Matsuda <[email protected]> on 2012-06-26
Reviewed by James Robinson.
No new tests. This patch doesn't change behavior.
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::getFramebufferPixels):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121266 => 121267)
--- trunk/Source/WebCore/ChangeLog 2012-06-26 17:01:21 UTC (rev 121266)
+++ trunk/Source/WebCore/ChangeLog 2012-06-26 17:56:46 UTC (rev 121267)
@@ -1,3 +1,15 @@
+2012-06-26 Yasuhiro Matsuda <[email protected]>
+
+ [chromium] Add the workaround of IOSurface-related corruption during readback on Mac OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=89797
+
+ Reviewed by James Robinson.
+
+ No new tests. This patch doesn't change behavior.
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::getFramebufferPixels):
+
2012-06-26 Alexei Filippov <[email protected]>
Web Inspector: Native memory snapshots crash in debug mode.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (121266 => 121267)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-06-26 17:01:21 UTC (rev 121266)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-06-26 17:56:46 UTC (rev 121267)
@@ -115,16 +115,10 @@
return screen;
}
-bool needsLionIOSurfaceReadbackWorkaround()
+bool needsIOSurfaceReadbackWorkaround()
{
#if OS(DARWIN)
- static SInt32 systemVersion = 0;
- if (!systemVersion) {
- if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)
- return false;
- }
-
- return systemVersion >= 0x1070;
+ return true;
#else
return false;
#endif
@@ -1260,13 +1254,13 @@
makeContextCurrent();
- bool doWorkaround = needsLionIOSurfaceReadbackWorkaround();
+ bool doWorkaround = needsIOSurfaceReadbackWorkaround();
Platform3DObject temporaryTexture = NullPlatform3DObject;
Platform3DObject temporaryFBO = NullPlatform3DObject;
if (doWorkaround) {
- // On Mac OS X 10.7, calling glReadPixels against an FBO whose color attachment is an
+ // On Mac OS X, calling glReadPixels against an FBO whose color attachment is an
// IOSurface-backed texture causes corruption of future glReadPixels calls, even those on
// different OpenGL contexts. It is believed that this is the root cause of top crasher
// http://crbug.com/99393. <rdar://problem/10949687>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
