diff options
| author | 2015-12-03 12:16:56 -0800 | |
|---|---|---|
| committer | 2015-12-07 12:34:46 -0800 | |
| commit | 15c3f19a445b8df575911a16e8a6dba755a084b5 (patch) | |
| tree | 5e3a71be6407e696ce6256c3825eb94632fbc541 /libs/hwui/FontRenderer.h | |
| parent | e920098f31860824ca714f10b2e72dbff5442184 (diff) | |
Merged op dispatch in OpReorderer
bug:22480459
Also switches std::functions to function pointers on OpReorderer, and
switches AssetAtlas' entry getter methods to using pixelRef pointers,
so it's clear they're the keys.
Change-Id: I3040ce5ff4e178a8364e0fd7ab0876ada7d4de05
Diffstat (limited to 'libs/hwui/FontRenderer.h')
| -rw-r--r-- | libs/hwui/FontRenderer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h index 87cfe7ff98e0..ff4dc4aef94a 100644 --- a/libs/hwui/FontRenderer.h +++ b/libs/hwui/FontRenderer.h @@ -57,6 +57,7 @@ public: #if HWUI_NEW_OPS BakedOpRenderer* renderer, const BakedOpState* bakedState, + const Rect* clip, #else OpenGLRenderer* renderer, #endif @@ -65,6 +66,7 @@ public: : renderer(renderer) #if HWUI_NEW_OPS , bakedState(bakedState) + , clip(clip) #endif , x(x) , y(y) @@ -79,6 +81,7 @@ public: #if HWUI_NEW_OPS BakedOpRenderer* renderer; const BakedOpState* bakedState; + const Rect* clip; #else OpenGLRenderer* renderer; #endif |