diff options
author | reed <reed@chromium.org> | 2016-01-23 14:19:06 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-23 14:19:06 -0800 |
commit | 5f34e8ed82e6cbf29401bda5d423a50a2ab6db74 (patch) | |
tree | cce8674aa52db02264b39c64856c14ab4eb57c44 /include | |
parent | a9909121ebdd35fb8d8694103a443f230ffa3a3a (diff) |
Revert of expand unitests for color4f (patchset #1 id:1 of https://codereview.chromium.org/1622893002/ )
Reason for revert:
leaking shadercontext in test
Original issue's description:
> expand unitests for color4f
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1622893002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/fac684502b6047ffc7dc2e59bd7e5a7cbfa5bf78
TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1622923002
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkColor.h | 2 | ||||
-rw-r--r-- | include/core/SkColorFilter.h | 4 | ||||
-rw-r--r-- | include/core/SkShader.h | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/include/core/SkColor.h b/include/core/SkColor.h index 3ebd18b7aa..f18fb7ee5e 100644 --- a/include/core/SkColor.h +++ b/include/core/SkColor.h @@ -169,8 +169,6 @@ struct SkPM4f { float fVec[4]; float a() const { return fVec[SK_A32_SHIFT/8]; } - - static SkPM4f FromPMColor(SkPMColor); }; /* diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index aece22e05a..211aae6962 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -81,10 +81,6 @@ public: */ virtual uint32_t getFlags() const { return 0; } - bool supports4f() const { - return SkToBool(this->getFlags() & kSupports4f_Flag); - } - /** * If this subclass can optimally createa composition with the inner filter, return it as * a new filter (which the caller must unref() when it is done). If no such optimization diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 297091d542..bf6d6ddb42 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -121,10 +121,6 @@ public: */ virtual uint32_t getFlags() const { return 0; } - bool supports4f() const { - return SkToBool(this->getFlags() & kSupports4f_Flag); - } - /** * Called for each span of the object being drawn. Your subclass should * set the appropriate colors (with premultiplied alpha) that correspond |