ui: Move compositor/ directory out of gfx/, up to ui/.

ui/compositor/compositor.h

 // 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.
 
-#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_H_
-#define UI_GFX_COMPOSITOR_COMPOSITOR_H_
+#ifndef UI_COMPOSITOR_COMPOSITOR_H_
+#define UI_COMPOSITOR_COMPOSITOR_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
-#include "ui/gfx/compositor/compositor_export.h"
+#include "ui/compositor/compositor_export.h"
 #include "ui/gfx/gl/gl_share_group.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 
+class SkBitmap;
 
-class SkBitmap;
 namespace gfx {
 class GLContext;
 class GLSurface;
 class GLShareGroup;
 class Point;
 class Rect;
 }
 
 namespace ui {
 
@@ skipping 173 matching lines @@
   virtual void layout();
   virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                    float scaleFactor);
   virtual WebKit::WebGraphicsContext3D* createContext3D();
   virtual void didRebindGraphicsContext(bool success);
   virtual void didCommitAndDrawFrame();
   virtual void didCompleteSwapBuffers();
   virtual void scheduleComposite();
 
  private:
+  friend class base::RefCounted<Compositor>;
+
   // When reading back pixel data we often get RGBA rather than BGRA pixels and
   // and the image often needs to be flipped vertically.
   static void SwizzleRGBAToBGRAAndFlip(unsigned char* pixels,
                                        const gfx::Size& image_size);
 
   // Notifies the compositor that compositing is complete.
   void NotifyEnd();
 
   CompositorDelegate* delegate_;
   gfx::Size size_;
 
   // The root of the Layer tree drawn by this compositor.
   Layer* root_layer_;
 
   ObserverList<CompositorObserver> observer_list_;
 
   gfx::AcceleratedWidget widget_;
   WebKit::WebLayer root_web_layer_;
   WebKit::WebLayerTreeView host_;
 
   // This is set to true when the swap buffers has been posted and we're waiting
   // for completion.
   bool swap_posted_;
-
-  friend class base::RefCounted<Compositor>;
 };
 
 }  // namespace ui
 
-#endif  // UI_GFX_COMPOSITOR_COMPOSITOR_H_
+#endif  // UI_COMPOSITOR_COMPOSITOR_H_