Remove some content_child dependency from content_common

content/common/gpu/media/vaapi_video_decode_accelerator.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
-#include "content/child/child_thread.h"
+#include "base/threading/non_thread_safe.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/video/picture.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_binders.h"
 
 static void ReportToUMA(
     content::VaapiH264Decoder::VAVDAH264DecoderFailure failure) {
   UMA_HISTOGRAM_ENUMERATION(
@@ skipping 38 matching lines @@
   }
 }
 
 // TFPPicture allocates X Pixmaps and binds them to textures passed
 // in PictureBuffers from clients to them. TFPPictures are created as
 // a consequence of receiving a set of PictureBuffers from clients and released
 // at the end of decode (or when a new set of PictureBuffers is required).
 //
 // TFPPictures are used for output, contents of VASurfaces passed from decoder
 // are put into the associated pixmap memory and sent to client.
-class VaapiVideoDecodeAccelerator::TFPPicture {
+class VaapiVideoDecodeAccelerator::TFPPicture : public base::NonThreadSafe {
  public:
   ~TFPPicture();
 
   static linked_ptr<TFPPicture> Create(
       const base::Callback<bool(void)>& make_context_current,
       const GLXFBConfig& fb_config,
       Display* x_display,
       int32 picture_buffer_id,
       uint32 texture_id,
       gfx::Size size);
@@ skipping 69 matching lines @@
                      texture_id, size));
 
   if (!tfp_picture->Initialize(fb_config))
     tfp_picture.reset();
 
   return tfp_picture;
 }
 
 bool VaapiVideoDecodeAccelerator::TFPPicture::Initialize(
     const GLXFBConfig& fb_config) {
-  // Check for NULL prevents unittests from crashing on nonexistent ChildThread.
-  DCHECK(ChildThread::current() == NULL ||
-      ChildThread::current()->message_loop() == base::MessageLoop::current());
-
+  DCHECK(CalledOnValidThread());
   if (!make_context_current_.Run())
     return false;
 
   XWindowAttributes win_attr;
   int screen = DefaultScreen(x_display_);
   XGetWindowAttributes(x_display_, RootWindow(x_display_, screen), &win_attr);
   //TODO(posciak): pass the depth required by libva, not the RootWindow's depth
   x_pixmap_ = XCreatePixmap(x_display_, RootWindow(x_display_, screen),
                             size_.width(), size_.height(), win_attr.depth);
   if (!x_pixmap_) {
@@ skipping 11 matching lines @@
   if (!glx_pixmap_) {
     // x_pixmap_ will be freed in the destructor.
     DVLOG(1) << "Failed creating a GLX Pixmap for TFP";
     return false;
   }
 
   return true;
 }
 
 VaapiVideoDecodeAccelerator::TFPPicture::~TFPPicture() {
-  // Check for NULL prevents unittests from crashing on nonexistent ChildThread.
-  DCHECK(ChildThread::current() == NULL ||
-      ChildThread::current()->message_loop() == base::MessageLoop::current());
-
+  DCHECK(CalledOnValidThread());
   // Unbind surface from texture and deallocate resources.
   if (glx_pixmap_ && make_context_current_.Run()) {
     glXReleaseTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT);
     glXDestroyPixmap(x_display_, glx_pixmap_);
   }
 
   if (x_pixmap_)
     XFreePixmap(x_display_, x_pixmap_);
   XSync(x_display_, False);  // Needed to work around buggy vdpau-driver.
 }
 
 bool VaapiVideoDecodeAccelerator::TFPPicture::Bind() {
+  DCHECK(CalledOnValidThread());
   DCHECK(x_pixmap_);
   DCHECK(glx_pixmap_);
-  // Check for NULL prevents unittests from crashing on nonexistent ChildThread.
-  DCHECK(ChildThread::current() == NULL ||
-      ChildThread::current()->message_loop() == base::MessageLoop::current());
-
   if (!make_context_current_.Run())
     return false;
 
   gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
   glXBindTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT, NULL);
 
   return true;
 }
 
 VaapiVideoDecodeAccelerator::TFPPicture*
@@ skipping 692 matching lines @@
   state_ = kUninitialized;
 }
 
 void VaapiVideoDecodeAccelerator::Destroy() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
   Cleanup();
   delete this;
 }
 
 }  // namespace content