Log erros while presenting an IOSurface to about:gpu

content/browser/compositor/io_surface_layer_mac.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/compositor/io_surface_layer_mac.h"
 
+#include <sstream>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/OpenGL.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gl/scoped_cgl.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 // Convenience macro for checking errors in the below code.
 #define CHECK_GL_ERROR() do {                                           \
     GLenum gl_error = glGetError();                                     \
     LOG_IF(ERROR, gl_error != GL_NO_ERROR) << "GL Error: " << gl_error; \
   } while (0)
 
+// Helper function for logging error codes.
+namespace {
+template<typename T>
+std::string to_string(T value) {
+  std::ostringstream stream;
+  stream << value;
+  return stream.str();
+}
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // IOSurfaceLayer(Private)
 
 @interface IOSurfaceLayer(Private)
 // Force a draw immediately, but only if one was requested.
 - (void)displayIfNeededAndAck;
 
 // Called  when it has been a fixed interval of time and a frame has yet to be
 // drawn.
 - (void)timerFired;
@@ skipping 115 matching lines @@
   helper_->ResetTimer();
 
   frame_pixel_size_ = pixel_size;
 
   // If this is a new IOSurface, open the IOSurface and mark that the
   // GL texture needs to bind to the new surface.
   if (!io_surface_ || io_surface_id != IOSurfaceGetID(io_surface_)) {
     io_surface_.reset(IOSurfaceLookup(io_surface_id));
     io_surface_texture_dirty_ = true;
     if (!io_surface_) {
-      LOG(ERROR) << "Failed to open IOSurface for frame";
+      content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+          logging::LOG_ERROR,
+          "IOSurfaceLayer",
+          "Failed to open IOSurface in gotFrameWithIOSurface");
       if (client_)
         client_->IOSurfaceLayerHitError();
     }
   }
 
   // If reqested, draw immediately and don't bother trying to use the
   // isAsynchronous property to ensure smooth animation. If this is while
   // frames are being pumped then ack and display immediately to get a
   // correct-sized frame displayed as soon as possible.
   if (is_pumping_frames_ ||
@@ skipping 94 matching lines @@
   std::vector<CGLPixelFormatAttribute> attribs;
   attribs.push_back(kCGLPFADepthSize);
   attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
   if (ui::GpuSwitchingManager::GetInstance()->SupportsDualGpus()) {
     attribs.push_back(kCGLPFAAllowOfflineRenderers);
     attribs.push_back(static_cast<CGLPixelFormatAttribute>(1));
   }
   attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
   GLint number_virtual_screens = 0;
   base::ScopedTypeRef<CGLPixelFormatObj> pixel_format;
-  CGLError error = CGLChoosePixelFormat(
+  CGLError cgl_error = CGLChoosePixelFormat(
       &attribs.front(), pixel_format.InitializeInto(), &number_virtual_screens);
-  if (error != kCGLNoError) {
-    LOG(ERROR) << "Failed to create pixel format object.";
+  if (cgl_error != kCGLNoError) {
+    content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+        logging::LOG_ERROR,
+        "IOSurfaceLayer",
+        std::string("Failed to create pixel format object with CGL error ") +
+            to_string(static_cast<int>(cgl_error)));
     return NULL;
   }
   return CGLRetainPixelFormat(pixel_format);
 }
 
 - (void)releaseCGLContext:(CGLContextObj)glContext {
   // The GL context is being destroyed, so mark the resources as needing to be
   // recreated.
   io_surface_texture_ = 0;
   io_surface_texture_dirty_ = true;
@@ skipping 33 matching lines @@
         GL_TEXTURE_RECTANGLE_ARB,
         GL_RGBA,
         IOSurfaceGetWidth(io_surface_),
         IOSurfaceGetHeight(io_surface_),
         GL_BGRA,
         GL_UNSIGNED_INT_8_8_8_8_REV,
         io_surface_.get(),
         0 /* plane */);
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
     if (cgl_error != kCGLNoError) {
-      LOG(ERROR) << "CGLTexImageIOSurface2D failed with " << cgl_error;
+      content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+          logging::LOG_ERROR,
+          "IOSurfaceLayer",
+          std::string("CGLTexImageIOSurface2D failed with CGL error ") +
+              to_string(cgl_error));
       glDeleteTextures(1, &io_surface_texture_);
       io_surface_texture_ = 0;
       if (client_)
         client_->IOSurfaceLayerHitError();
     }
   } else if (io_surface_texture_) {
     glDeleteTextures(1, &io_surface_texture_);
     io_surface_texture_ = 0;
   }
 
@@ skipping 32 matching lines @@
     glEnd();
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
     glDisable(GL_TEXTURE_RECTANGLE_ARB);
 
     // Workaround for issue 158469. Issue a dummy draw call with
     // io_surface_texture_ not bound to a texture, in order to shake all
     // references to the IOSurface out of the driver.
     glBegin(GL_TRIANGLES);
     glEnd();
   } else {
+    content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+        logging::LOG_ERROR,
+        "IOSurfaceLayer",
+        std::string("No texture to draw, clearing to white"));
     glClearColor(1, 1, 1, 1);
     glClear(GL_COLOR_BUFFER_BIT);
   }
 
   // Query the current GL renderer to send back to the GPU process.
   {
     CGLError cgl_error = CGLGetParameter(
         glContext, kCGLCPCurrentRendererID, &cgl_renderer_id_);
     if (cgl_error == kCGLNoError) {
       cgl_renderer_id_ &= kCGLRendererIDMatchingMask;
     } else {
-      LOG(ERROR) << "CGLGetParameter for kCGLCPCurrentRendererID failed with "
-                 << cgl_error;
+      content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+          logging::LOG_ERROR,
+          "IOSurfaceLayer",
+          std::string("CGLGetParameter for kCGLCPCurrentRendererID failed ") +
+              std::string("with CGL error ") + to_string(cgl_error));
       cgl_renderer_id_ = 0;
     }
   }
 
   // If we hit any errors, tell the client.
   while (GLenum gl_error = glGetError()) {
-    LOG(ERROR) << "Hit GL error " << gl_error;
+    content::GpuDataManagerImpl::GetInstance()->AddLogMessage(
+        logging::LOG_ERROR,
+        "IOSurfaceLayer",
+        std::string("Hit GL error ") + to_string(gl_error) +
+            std::string(" in drawInCGLContext"));
     if (client_)
       client_->IOSurfaceLayerHitError();
   }
 
   needs_display_ = false;
   [super drawInCGLContext:glContext
               pixelFormat:pixelFormat
              forLayerTime:timeInterval
               displayTime:timeStamp];
 
   [self ackPendingFrame];
 }
 
 @end