ozone: Clarify All SurfaceFactoryOzone APIs except for CreateNativePixmap() must be used on the mai…

ui/ozone/platform/drm/gbm_surface_factory.cc

 // Copyright 2014 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 "ui/ozone/platform/drm/gbm_surface_factory.h"
 
 #include <gbm.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 56 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SingleOverlay);
 };
 
 }  // namespace
 
 GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
     : DrmSurfaceFactory(NULL), allow_surfaceless_(allow_surfaceless) {
 }
 
 GbmSurfaceFactory::~GbmSurfaceFactory() {
+  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void GbmSurfaceFactory::InitializeGpu(DrmDeviceManager* drm_device_manager,
                                       ScreenManager* screen_manager) {
   drm_device_manager_ = drm_device_manager;
   screen_manager_ = screen_manager;
 }
 
 intptr_t GbmSurfaceFactory::GetNativeDisplay() {
+  DCHECK(thread_checker_.CalledOnValidThread());
 #if defined(USE_MESA_PLATFORM_NULL)
   return EGL_DEFAULT_DISPLAY;
 #else
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(gfx::kNullAcceleratedWidget);
   DCHECK(gbm);
   return reinterpret_cast<intptr_t>(gbm->device());
 #endif
 }
 
 int GbmSurfaceFactory::GetDrmFd() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(gfx::kNullAcceleratedWidget);
   DCHECK(gbm);
   return gbm->get_fd();
 }
 
 const int32* GbmSurfaceFactory::GetEGLSurfaceProperties(
     const int32* desired_list) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   static const int32 kConfigAttribs[] = {EGL_BUFFER_SIZE,
                                          32,
                                          EGL_ALPHA_SIZE,
                                          8,
                                          EGL_BLUE_SIZE,
                                          8,
                                          EGL_GREEN_SIZE,
                                          8,
                                          EGL_RED_SIZE,
                                          8,
                                          EGL_RENDERABLE_TYPE,
                                          EGL_OPENGL_ES2_BIT,
                                          EGL_SURFACE_TYPE,
                                          EGL_WINDOW_BIT,
                                          EGL_NONE};
 
   return kConfigAttribs;
 }
 
 bool GbmSurfaceFactory::LoadEGLGLES2Bindings(
     AddGLLibraryCallback add_gl_library,
     SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
 }
 
 scoped_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   LOG(FATAL) << "Software rendering mode is not supported with GBM platform";
   return nullptr;
 }
 
 scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_ptr<GbmSurface> surface(
       new GbmSurface(screen_manager_->GetWindow(widget), gbm));
   if (!surface->Initialize())
     return nullptr;
 
   return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
 GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (!allow_surfaceless_)
     return nullptr;
 
   return make_scoped_ptr(new GbmSurfaceless(screen_manager_->GetWindow(widget),
                                             drm_device_manager_));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
@@ skipping 12 matching lines @@
 
   scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer));
   if (!pixmap->Initialize())
     return nullptr;
 
   return pixmap;
 }
 
 OverlayCandidatesOzone* GbmSurfaceFactory::GetOverlayCandidates(
     gfx::AcceleratedWidget w) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kOzoneTestSingleOverlaySupport))
     return new SingleOverlay();
   return NULL;
 }
 
 bool GbmSurfaceFactory::ScheduleOverlayPlane(
     gfx::AcceleratedWidget widget,
     int plane_z_order,
     gfx::OverlayTransform plane_transform,
     scoped_refptr<NativePixmap> buffer,
     const gfx::Rect& display_bounds,
     const gfx::RectF& crop_rect) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   scoped_refptr<GbmPixmap> pixmap = static_cast<GbmPixmap*>(buffer.get());
   if (!pixmap.get()) {
     LOG(ERROR) << "ScheduleOverlayPlane passed NULL buffer.";
     return false;
   }
   HardwareDisplayController* hdc =
       screen_manager_->GetWindow(widget)->GetController();
   if (!hdc)
     return true;
 
   hdc->QueueOverlayPlane(OverlayPlane(pixmap->buffer(), plane_z_order,
                                       plane_transform, display_bounds,
                                       crop_rect));
   return true;
 }
 
 bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return allow_surfaceless_;
 }
 
 bool GbmSurfaceFactory::CanCreateNativePixmap(BufferUsage usage) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   switch (usage) {
     case MAP:
       return false;
     case SCANOUT:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 scoped_refptr<GbmDevice> GbmSurfaceFactory::GetGbmDevice(
     gfx::AcceleratedWidget widget) {
   return static_cast<GbmDevice*>(
       drm_device_manager_->GetDrmDevice(widget).get());
 }
 
 }  // namespace ui