diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 22:17:59 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 22:17:59 +0000 |
| commit | 563ad175e056edf70d6b4fad486f671f2ee08336 (patch) | |
| tree | 1771310308ca9f9edf87085da0ddb1dae3650c36 | |
| parent | 5308600f855e0bcf41ec6883adbbb5c3a4f53814 (diff) | |
| download | chromium_src-563ad175e056edf70d6b4fad486f671f2ee08336.zip chromium_src-563ad175e056edf70d6b4fad486f671f2ee08336.tar.gz chromium_src-563ad175e056edf70d6b4fad486f671f2ee08336.tar.bz2 | |
Merge 160249 - Completely remove call to CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext
This function sometimes crashes with mirrored displays. The CVDisplayLink works even when Chrome doesn't call it, so don't call it.
BUG=153088
Review URL: https://chromiumcodereview.appspot.com/11040012
TBR=jbauman@chromium.org
Review URL: https://codereview.chromium.org/11066106
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@161213 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/compositing_iosurface_mac.mm | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm index 28ebd37..a976893 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_mac.mm @@ -190,21 +190,6 @@ CompositingIOSurfaceMac* CompositingIOSurfaceMac::Create() { return NULL; } - // Set the display link for the current renderer - CGLPixelFormatObj cglPixelFormat = - (CGLPixelFormatObj)[glPixelFormat CGLPixelFormatObj]; - ret = CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(display_link, - cglContext, - cglPixelFormat); - // This can fail with kCVReturnInvalidDisplay on mirrored displays, so - // ignore that failure and continue. http://crbug.com/152525 - if (ret != kCVReturnSuccess && ret != kCVReturnInvalidDisplay) { - CVDisplayLinkRelease(display_link); - LOG(ERROR) << "CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext failed: " - << ret; - return NULL; - } - return new CompositingIOSurfaceMac(io_surface_support, glContext.release(), cglContext, shader_program_blit_rgb, |