Move components/display_compositor to components/viz/display_compositor

components/viz/display_compositor/buffer_queue.h

 // 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.
 
-#ifndef COMPONENTS_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_
-#define COMPONENTS_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_
+#ifndef COMPONENTS_VIZ_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_
+#define COMPONENTS_VIZ_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_
 
 #include <stddef.h>
 
 #include <deque>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "components/display_compositor/display_compositor_export.h"
+#include "components/viz/viz_export.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class GpuMemoryBuffer;
 }
 
 namespace gpu {
 class GpuMemoryBufferManager;
 
 namespace gles2 {
 class GLES2Interface;
 }
 }
 
-namespace display_compositor {
+namespace viz {
 
 class GLHelper;
 
 // Provides a surface that manages its own buffers, backed by GpuMemoryBuffers
 // created using CHROMIUM_image. Double/triple buffering is implemented
 // internally. Doublebuffering occurs if PageFlipComplete is called before the
 // next BindFramebuffer call, otherwise it creates extra buffers.
-class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
+class VIZ_EXPORT BufferQueue {
  public:
   BufferQueue(gpu::gles2::GLES2Interface* gl,
               uint32_t texture_target,
               uint32_t internal_format,
               gfx::BufferFormat format,
               GLHelper* gl_helper,
               gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
               gpu::SurfaceHandle surface_handle);
   virtual ~BufferQueue();
 
   void Initialize();
 
   void BindFramebuffer();
   void SwapBuffers(const gfx::Rect& damage);
   void PageFlipComplete();
   void Reshape(const gfx::Size& size,
                float scale_factor,
                const gfx::ColorSpace& color_space,
                bool use_stencil);
   void RecreateBuffers();
   uint32_t GetCurrentTextureId() const;
 
   uint32_t fbo() const { return fbo_; }
   uint32_t internal_format() const { return internal_format_; }
 
  private:
   friend class BufferQueueTest;
   friend class AllocatedSurface;
 
-  struct DISPLAY_COMPOSITOR_EXPORT AllocatedSurface {
+  struct VIZ_EXPORT AllocatedSurface {
     AllocatedSurface(BufferQueue* buffer_queue,
                      std::unique_ptr<gfx::GpuMemoryBuffer> buffer,
                      uint32_t texture,
                      uint32_t image,
                      uint32_t stencil,
                      const gfx::Rect& rect);
     ~AllocatedSurface();
     BufferQueue* const buffer_queue;
     std::unique_ptr<gfx::GpuMemoryBuffer> buffer;
     const uint32_t texture;
@@ skipping 40 matching lines @@
   // These have been swapped but are not displayed yet. Entries of this deque
   // may be nullptr, if they represent frames that have been destroyed.
   std::deque<std::unique_ptr<AllocatedSurface>> in_flight_surfaces_;
   GLHelper* gl_helper_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   gpu::SurfaceHandle surface_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferQueue);
 };
 
-}  // namespace display_compositor
+}  // namespace viz
 
-#endif  // COMPONENTS_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_
+#endif  // COMPONENTS_VIZ_DISPLAY_COMPOSITOR_BUFFER_QUEUE_H_