diff options
author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:40:54 +0000 |
---|---|---|
committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:40:54 +0000 |
commit | 170e1a0af91458ae73894ca80feba8020b49c278 (patch) | |
tree | cb159fdd079f4ffacb7278040d457441d836142e | |
parent | bf54920ec8cdd09ca4619a0689fc5d5713a99287 (diff) | |
download | chromium_src-170e1a0af91458ae73894ca80feba8020b49c278.zip chromium_src-170e1a0af91458ae73894ca80feba8020b49c278.tar.gz chromium_src-170e1a0af91458ae73894ca80feba8020b49c278.tar.bz2 |
Allow display link creation to fail on Mac
Some headless systems will fail to create a display link, but are still
capable of displaying content.
BUG=347034
Review URL: https://codereview.chromium.org/180783006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253901 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/browser/renderer_host/compositing_iosurface_context_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.mm b/content/browser/renderer_host/compositing_iosurface_context_mac.mm index 899703b..cd27ef3 100644 --- a/content/browser/renderer_host/compositing_iosurface_context_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_context_mac.mm @@ -148,8 +148,9 @@ CompositingIOSurfaceContext::Get(int window_number) { if (!is_vsync_disabled) { display_link = DisplayLinkMac::Create(); if (!display_link) { + // On some headless systems, the display link will fail to be created, + // so this should not be a fatal error. LOG(ERROR) << "Failed to create display link for GL context."; - return NULL; } } |