Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: src/core/SkEmptyShader.h

Issue 1759323002: Revert of enforce 16byte alignment in shader contexts (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkDraw.cpp ('k') | src/core/SkLightingShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkEmptyShader.h
diff --git a/src/core/SkEmptyShader.h b/src/core/SkEmptyShader.h
index 42b61c52feffa9478817fe9edd212eb5a281d2da..c1713d1a2ee91e7a4bbabcaed144589911d4c204 100644
--- a/src/core/SkEmptyShader.h
+++ b/src/core/SkEmptyShader.h
@@ -20,16 +20,16 @@
public:
SkEmptyShader() {}
+ size_t contextSize(const ContextRec&) const override {
+ // Even though createContext returns nullptr we have to return a value of at least
+ // sizeof(SkShader::Context) to satisfy SkSmallAllocator.
+ return sizeof(SkShader::Context);
+ }
+
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
protected:
- size_t onContextSize(const ContextRec&) const override {
- // Even though createContext returns nullptr we have to return a value of at least
- // sizeof(SkShader::Context) to satisfy SkSmallAllocator.
- return SkAlign16(sizeof(SkShader::Context));
- }
-
SkShader::Context* onCreateContext(const ContextRec&, void*) const override {
return nullptr;
}
« no previous file with comments | « src/core/SkDraw.cpp ('k') | src/core/SkLightingShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698