Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient

content/common/gpu/image_transport_surface.cc

Index: content/common/gpu/image_transport_surface.cc
diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
index 8e8de9ebc95c1c93c9c9f180858b8c5bd850881b..8ac506dbe2cd053ac30ca0232c3a04f29b61cf76 100644
--- a/content/common/gpu/image_transport_surface.cc
+++ b/content/common/gpu/image_transport_surface.cc
@@ -16,6 +16,7 @@
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ui/gl/gl_switches.h"
+#include "ui/gl/gl_implementation.h"
 
 ImageTransportSurface::ImageTransportSurface() {}
 
@@ -112,6 +113,10 @@ void ImageTransportHelper::SendAcceleratedSurfaceNew(
 
 void ImageTransportHelper::SendAcceleratedSurfaceBuffersSwapped(
     GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params) {
+  // TRACE_EVENT for gpu tests:
+  TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers",
+                       "GLImpl", static_cast<int>(gfx::GetGLImplementation()),
+                       "width", surface_->GetSize().width());
   params.surface_id = stub_->surface_id();
   params.route_id = route_id_;
 #if defined(OS_MACOSX)
@@ -326,6 +331,10 @@ void PassThroughImageTransportSurface::OnResize(gfx::Size size) {
   }
 }
 
+gfx::Size PassThroughImageTransportSurface::GetSize() {
+  return GLSurfaceAdapter::GetSize();
+}
+
 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {}
 
 #endif  // defined(ENABLE_GPU)