54924243c1
The following changes were made by this CL: 1. Make flatten() a protected method as callers should use SkFlattenableWriteBuffer to flatten an object 2. Make flatten a const method (including subclasses) 3. Mark subclass implementation of flatten with SK_OVERRIDE 4. Ensure overridden flatten impls call their parent 5. Remove no-op implementations of flatten from subclasses Additionally, if necessary the unflattening constructor was also moved to the protected section of the subclasses header if it was not already there. git-svn-id: http://skia.googlecode.com/svn/trunk@3540 2bbb7eff-a529-9590-31e7-b0007b416f81
58 lines
1.2 KiB
C++
58 lines
1.2 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef SkRectShape_DEFINED
|
|
#define SkRectShape_DEFINED
|
|
|
|
#include "SkShape.h"
|
|
#include "SkPaint.h"
|
|
#include "SkSize.h"
|
|
|
|
class SkPaintShape : public SkShape {
|
|
public:
|
|
SkPaintShape();
|
|
|
|
SkPaint& paint() { return fPaint; }
|
|
const SkPaint& paint() const { return fPaint; }
|
|
|
|
protected:
|
|
SkPaintShape(SkFlattenableReadBuffer& buffer);
|
|
virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
|
|
|
|
private:
|
|
SkPaint fPaint;
|
|
|
|
typedef SkShape INHERITED;
|
|
};
|
|
|
|
class SkRectShape : public SkPaintShape {
|
|
public:
|
|
SkRectShape();
|
|
|
|
void setRect(const SkRect&);
|
|
void setOval(const SkRect&);
|
|
void setCircle(SkScalar x, SkScalar y, SkScalar radius);
|
|
void setRRect(const SkRect&, SkScalar rx, SkScalar ry);
|
|
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShape)
|
|
|
|
protected:
|
|
SkRectShape(SkFlattenableReadBuffer&);
|
|
virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
|
|
|
|
// overrides
|
|
virtual void onDraw(SkCanvas*);
|
|
|
|
private:
|
|
SkRect fBounds;
|
|
SkSize fRadii;
|
|
|
|
typedef SkPaintShape INHERITED;
|
|
};
|
|
|
|
#endif
|