Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/quads/yuv_video_draw_quad.h

 // Copyright 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 CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_
 #define CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
 
 namespace cc {
 
 class CC_EXPORT YUVVideoDrawQuad : public DrawQuad {
  public:
   enum ColorSpace {
-    REC_601,  // SDTV standard with restricted "studio swing" color range.
-    REC_709,  // HDTV standard with restricted "studio swing" color range.
-    JPEG,     // Full color range [0, 255] JPEG color space.
-    COLOR_SPACE_LAST = JPEG
+    REC_601,       // SDTV standard with restricted "studio swing" color range.
+    REC_601_JPEG,  // Full color range [0, 255] variant of the above.
+    COLOR_SPACE_LAST = REC_601_JPEG
   };
 
   ~YUVVideoDrawQuad() override;
 
   YUVVideoDrawQuad();
 
   void SetNew(const SharedQuadState* shared_quad_state,
               const gfx::Rect& rect,
               const gfx::Rect& opaque_rect,
               const gfx::Rect& visible_rect,
@@ skipping 31 matching lines @@
 
   static const YUVVideoDrawQuad* MaterialCast(const DrawQuad*);
 
  private:
   void ExtendValue(base::trace_event::TracedValue* value) const override;
 };
 
 }  // namespace cc
 
 #endif  // CC_QUADS_YUV_VIDEO_DRAW_QUAD_H_