| Index: cc/quads/surface_draw_quad.h
|
| diff --git a/cc/quads/checkerboard_draw_quad.h b/cc/quads/surface_draw_quad.h
|
| similarity index 56%
|
| copy from cc/quads/checkerboard_draw_quad.h
|
| copy to cc/quads/surface_draw_quad.h
|
| index 4f7452eb0a6b620a1aaf12cc7c0789dae1e87c5b..b1e614122750ab33fe618529d581e4314c74f44b 100644
|
| --- a/cc/quads/checkerboard_draw_quad.h
|
| +++ b/cc/quads/surface_draw_quad.h
|
| @@ -1,44 +1,43 @@
|
| -// Copyright 2012 The Chromium Authors. All rights reserved.
|
| +// 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_QUADS_CHECKERBOARD_DRAW_QUAD_H_
|
| -#define CC_QUADS_CHECKERBOARD_DRAW_QUAD_H_
|
| +#ifndef CC_QUADS_SURFACE_DRAW_QUAD_H_
|
| +#define CC_QUADS_SURFACE_DRAW_QUAD_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/quads/draw_quad.h"
|
| -#include "third_party/skia/include/core/SkColor.h"
|
|
|
| namespace cc {
|
|
|
| -class CC_EXPORT CheckerboardDrawQuad : public DrawQuad {
|
| +class CC_EXPORT SurfaceDrawQuad : public DrawQuad {
|
| public:
|
| - static scoped_ptr<CheckerboardDrawQuad> Create();
|
| + static scoped_ptr<SurfaceDrawQuad> Create();
|
|
|
| void SetNew(const SharedQuadState* shared_quad_state,
|
| gfx::Rect rect,
|
| - SkColor color);
|
| + int surface_id);
|
|
|
| void SetAll(const SharedQuadState* shared_quad_state,
|
| gfx::Rect rect,
|
| gfx::Rect opaque_rect,
|
| gfx::Rect visible_rect,
|
| bool needs_blending,
|
| - SkColor color);
|
| + int surface_id);
|
|
|
| - SkColor color;
|
| + int surface_id;
|
|
|
| virtual void IterateResources(const ResourceIteratorCallback& callback)
|
| - OVERRIDE;
|
| + OVERRIDE;
|
|
|
| - static const CheckerboardDrawQuad* MaterialCast(const DrawQuad*);
|
| + static const SurfaceDrawQuad* MaterialCast(const DrawQuad* quad);
|
|
|
| private:
|
| + SurfaceDrawQuad();
|
| virtual void ExtendValue(base::DictionaryValue* value) const OVERRIDE;
|
| - CheckerboardDrawQuad();
|
| };
|
|
|
| } // namespace cc
|
|
|
| -#endif // CC_QUADS_CHECKERBOARD_DRAW_QUAD_H_
|
| +#endif // CC_QUADS_SURFACE_DRAW_QUAD_H_
|
|
|