diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 22:39:57 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 22:39:57 +0000 |
| commit | 67d350f5cce4ff54a46782ed00e2be9bbe545504 (patch) | |
| tree | e9bb316485264cdbcfca1627e7773605bb11afee /remoting | |
| parent | ba30900da1e7d39516bf606cc9e802448b14441e (diff) | |
| download | chromium_src-67d350f5cce4ff54a46782ed00e2be9bbe545504.zip chromium_src-67d350f5cce4ff54a46782ed00e2be9bbe545504.tar.gz chromium_src-67d350f5cce4ff54a46782ed00e2be9bbe545504.tar.bz2 | |
Temporary fix for Mac black-screen issue.
BUG=139930
Review URL: https://chromiumcodereview.appspot.com/10850006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/video_frame_capturer_mac.mm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/remoting/host/video_frame_capturer_mac.mm b/remoting/host/video_frame_capturer_mac.mm index ccf9ebc..36b82ad 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); |