| Index: cc/quads/y_video_draw_quad.h
|
| diff --git a/cc/quads/stream_video_draw_quad.h b/cc/quads/y_video_draw_quad.h
|
| similarity index 52%
|
| copy from cc/quads/stream_video_draw_quad.h
|
| copy to cc/quads/y_video_draw_quad.h
|
| index 8137edb2b4eac5e989cede3c17f8d3d78e9a5665..725328569590a01e4187ed72170429bbb648e06a 100644
|
| --- a/cc/quads/stream_video_draw_quad.h
|
| +++ b/cc/quads/y_video_draw_quad.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 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_STREAM_VIDEO_DRAW_QUAD_H_
|
| -#define CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_
|
| +#ifndef CC_QUADS_Y_VIDEO_DRAW_QUAD_H_
|
| +#define CC_QUADS_Y_VIDEO_DRAW_QUAD_H_
|
|
|
| #include <stddef.h>
|
|
|
| @@ -11,52 +11,44 @@
|
|
|
| #include "cc/base/cc_export.h"
|
| #include "cc/quads/draw_quad.h"
|
| -#include "ui/gfx/transform.h"
|
| +#include "ui/gfx/geometry/rect_f.h"
|
|
|
| namespace cc {
|
|
|
| -class CC_EXPORT StreamVideoDrawQuad : public DrawQuad {
|
| +class CC_EXPORT YVideoDrawQuad : public DrawQuad {
|
| public:
|
| - StreamVideoDrawQuad();
|
| + static const size_t kResourceIdIndex = 0;
|
| +
|
| + YVideoDrawQuad();
|
| + YVideoDrawQuad(const YVideoDrawQuad& other);
|
|
|
| void SetNew(const SharedQuadState* shared_quad_state,
|
| const gfx::Rect& rect,
|
| const gfx::Rect& opaque_rect,
|
| const gfx::Rect& visible_rect,
|
| unsigned resource_id,
|
| - gfx::Size resource_size_in_pixels,
|
| - const gfx::Transform& matrix);
|
| + const gfx::PointF& uv_top_left,
|
| + const gfx::PointF& uv_bottom_right);
|
|
|
| void SetAll(const SharedQuadState* shared_quad_state,
|
| const gfx::Rect& rect,
|
| const gfx::Rect& opaque_rect,
|
| const gfx::Rect& visible_rect,
|
| - bool needs_blending,
|
| unsigned resource_id,
|
| gfx::Size resource_size_in_pixels,
|
| - const gfx::Transform& matrix);
|
| -
|
| - gfx::Transform matrix;
|
| + const gfx::PointF& uv_top_left,
|
| + const gfx::PointF& uv_bottom_right);
|
|
|
| - struct OverlayResources {
|
| - OverlayResources();
|
| - gfx::Size size_in_pixels[Resources::kMaxResourceIdCount];
|
| - };
|
| - OverlayResources overlay_resources;
|
| -
|
| - static const StreamVideoDrawQuad* MaterialCast(const DrawQuad*);
|
| + gfx::PointF uv_top_left;
|
| + gfx::PointF uv_bottom_right;
|
|
|
| ResourceId resource_id() const { return resources.ids[kResourceIdIndex]; }
|
| - const gfx::Size& resource_size_in_pixels() const {
|
| - return overlay_resources.size_in_pixels[kResourceIdIndex];
|
| - }
|
| + static const YVideoDrawQuad* MaterialCast(const DrawQuad*);
|
|
|
| private:
|
| - static const size_t kResourceIdIndex = 0;
|
| -
|
| void ExtendValue(base::trace_event::TracedValue* value) const override;
|
| };
|
|
|
| } // namespace cc
|
|
|
| -#endif // CC_QUADS_STREAM_VIDEO_DRAW_QUAD_H_
|
| +#endif // CC_QUADS_Y_VIDEO_DRAW_QUAD_H_
|
|
|