Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(986)

Unified Diff: remoting/host/video_frame_capturer_mac.mm

Issue 10850006: Temporary fix for Mac black-screen issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added TODO. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/video_frame_capturer_mac.mm
diff --git a/remoting/host/video_frame_capturer_mac.mm b/remoting/host/video_frame_capturer_mac.mm
index ccf9ebc38163b6a2539e9effd7e70ee2bd61d37e..36b82ad24f84ab7d5de7396bd87b27923e7127dd 100644
--- a/remoting/host/video_frame_capturer_mac.mm
+++ b/remoting/host/video_frame_capturer_mac.mm
@@ -679,8 +679,15 @@ void VideoFrameCapturerMac::ScreenConfigurationChanged() {
err = CGLCreateContext(pixel_format, NULL, &cgl_context_);
DCHECK_EQ(err, kCGLNoError);
CGLDestroyPixelFormat(pixel_format);
- CGLSetFullScreenOnDisplay(cgl_context_,
- CGDisplayIDToOpenGLDisplayMask(mainDevice));
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // TODO(jamiewalch): The non-deprecated equivalent code is shown below, but
+ // it causes 10.6 Macs' displays to go black. Find out why.
+ //
+ // CGLSetFullScreenOnDisplay(cgl_context_,
+ // CGDisplayIDToOpenGLDisplayMask(mainDevice));
+ CGLSetFullScreen(cgl_context_);
+#pragma clang diagnostic pop
CGLSetCurrentContext(cgl_context_);
size_t buffer_size = width * height * sizeof(uint32_t);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698