cc: Make OverlayCandidate use gfx::BufferFormat instead of cc::ResourceFormat.

cc/output/overlay_candidate.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 CC_OUTPUT_OVERLAY_CANDIDATE_H_
 #define CC_OUTPUT_OVERLAY_CANDIDATE_H_
 
 #include <map>
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/base/resource_id.h"
 #include "cc/quads/render_pass.h"
-#include "cc/resources/resource_format.h"
+#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 20 matching lines @@
   static bool IsOccluded(const OverlayCandidate& candidate,
                          QuadList::ConstIterator quad_list_begin,
                          QuadList::ConstIterator quad_list_end);
 
   OverlayCandidate();
   OverlayCandidate(const OverlayCandidate& other);
   ~OverlayCandidate();
 
   // Transformation to apply to layer during composition.
   gfx::OverlayTransform transform;
-  // Format of the buffer to composite.
-  ResourceFormat format;
+  // Format of the buffer to scanout.
+  gfx::BufferFormat format;
   // Size of the resource, in pixels.
   gfx::Size resource_size_in_pixels;
   // Rect on the display to position the overlay to. Implementer must convert
   // to integer coordinates if setting |overlay_handled| to true.
   gfx::RectF display_rect;
   // Crop within the buffer to be placed inside |display_rect|.
   gfx::RectF uv_rect;
   // Quad geometry rect after applying the quad_transform().
   gfx::Rect quad_rect_in_target_space;
   // Clip rect in the target content space after composition.
@@ skipping 55 matching lines @@
   // overlay, if one backs them with a SurfaceView.
   PromotionHintInfoMap promotion_hint_info_map_;
 
   // Helper to insert |candidate| into |promotion_hint_info_|.
   void AddPromotionHint(const OverlayCandidate& candidate);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OVERLAY_CANDIDATE_H_