87fcd95019
Reason for revert: Chromium side change landed along side DEPS roll that includes r14323. Original issue's description: > Revert of Extract most of the mutable state of SkShader into a separate Context object. (https://codereview.chromium.org/207683004/) > > Reason for revert: > This is blocking the DEPS roll into Chromium. Failures can be seen here: > > http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/174333 > > Original issue's description: > > Extract most of the mutable state of SkShader into a separate Context object. > > > > SkShader currently stores some state during draw calls via setContext(...). > > Move that mutable state into a separate SkShader::Context class that is > > constructed on demand for the duration of the draw. > > > > Calls to setContext() are replaced with createContext() which returns a context > > corresponding to the shader object or NULL if the parameters to createContext > > are invalid. > > > > TEST=out/Debug/dm > > BUG=skia:1976 > > > > Committed: http://code.google.com/p/skia/source/detail?r=14216 > > > > Committed: http://code.google.com/p/skia/source/detail?r=14323 > > TBR=scroggo@google.com,skyostil@chromium.org,tomhudson@chromium.org,senorblanco@chromium.org,reed@google.com,bungeman@google.com,dominikg@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=skia:1976 > > Committed: http://code.google.com/p/skia/source/detail?r=14326 R=scroggo@google.com, skyostil@chromium.org, tomhudson@chromium.org, senorblanco@chromium.org, reed@google.com, bungeman@google.com, dominikg@chromium.org TBR=bungeman@google.com, dominikg@chromium.org, reed@google.com, scroggo@google.com, senorblanco@chromium.org, skyostil@chromium.org, tomhudson@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia:1976 Author: bsalomon@google.com Review URL: https://codereview.chromium.org/246403013 git-svn-id: http://skia.googlecode.com/svn/trunk@14328 2bbb7eff-a529-9590-31e7-b0007b416f81
52 lines
1.3 KiB
C++
52 lines
1.3 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 SkEmptyShader_DEFINED
|
|
#define SkEmptyShader_DEFINED
|
|
|
|
#include "SkShader.h"
|
|
|
|
/**
|
|
* \class SkEmptyShader
|
|
* A Shader that always draws nothing. Its createContext always returns NULL.
|
|
*/
|
|
class SK_API SkEmptyShader : public SkShader {
|
|
public:
|
|
SkEmptyShader() {}
|
|
|
|
virtual size_t contextSize() const SK_OVERRIDE {
|
|
// Even though createContext returns NULL we have to return a value of at least
|
|
// sizeof(SkShader::Context) to satisfy SkSmallAllocator.
|
|
return sizeof(SkShader::Context);
|
|
}
|
|
|
|
virtual bool validContext(const SkBitmap&, const SkPaint&,
|
|
const SkMatrix&, SkMatrix* totalInverse = NULL) const SK_OVERRIDE {
|
|
return false;
|
|
}
|
|
|
|
virtual SkShader::Context* createContext(const SkBitmap&, const SkPaint&,
|
|
const SkMatrix&, void*) const SK_OVERRIDE {
|
|
// validContext returns false.
|
|
return NULL;
|
|
}
|
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
|
|
|
|
protected:
|
|
SkEmptyShader(SkReadBuffer& buffer) : INHERITED(buffer) {}
|
|
|
|
private:
|
|
typedef SkShader INHERITED;
|
|
};
|
|
|
|
#endif
|