Move components/display_compositor to components/viz/display_compositor

components/viz/display_compositor/gl_helper_readback_support.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 "components/viz/display_compositor/gl_helper_readback_support.h"
 #include "base/logging.h"
-#include "components/display_compositor/gl_helper_readback_support.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 
-namespace display_compositor {
+namespace viz {
 
 GLHelperReadbackSupport::GLHelperReadbackSupport(gpu::gles2::GLES2Interface* gl)
     : gl_(gl) {
   InitializeReadbackSupport();
 }
 
 GLHelperReadbackSupport::~GLHelperReadbackSupport() {}
 
 void GLHelperReadbackSupport::InitializeReadbackSupport() {
   // We are concerned about 16, 32-bit formats only.  The below are the most
@@ skipping 47 matching lines @@
                                                   GLenum* type_out) {
   for (unsigned int i = 0; i < format_cache_.size(); i++) {
     if (format_cache_[i].format == format && format_cache_[i].type == type) {
       *format_out = format_cache_[i].read_format;
       *type_out = format_cache_[i].read_type;
       return;
     }
   }
 
   const int kTestSize = 64;
-  display_compositor::ScopedTexture dst_texture(gl_);
+  ScopedTexture dst_texture(gl_);
   ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(gl_, dst_texture);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl_->TexImage2D(GL_TEXTURE_2D, 0, format, kTestSize, kTestSize, 0, format,
                   type, NULL);
   ScopedFramebuffer dst_framebuffer(gl_);
   ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(gl_,
                                                              dst_framebuffer);
@@ skipping 73 matching lines @@
     case kARGB_4444_SkColorType:
       return GLHelperReadbackSupport::NOT_SUPPORTED;
     default:
       NOTREACHED();
       break;
   }
 
   return GLHelperReadbackSupport::NOT_SUPPORTED;
 }
 
-}  // namespace display_compositor
+}  // namespace viz