diff options
| author | Chris Craik <ccraik@google.com> | 2014-02-19 18:11:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 18:11:46 +0000 |
| commit | 66d792b6631a8dfd0dd0b7abc75077760fa083cc (patch) | |
| tree | 3d444a47d61f51b180a4261270ba8205b7fd0c3e /libs | |
| parent | a269eca8463ffc495b6b3cddf5d61833467dc49b (diff) | |
| parent | e9b8817bd720cd2a294126074eb533f943a9348f (diff) | |
| download | frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.zip frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.tar.gz frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.tar.bz2 | |
Merge "Make outline and shadow APIs public"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/DisplayList.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index a5e66fa..6144f3d 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -232,7 +232,7 @@ void DisplayList::init() { mOutline.rewind(); mClipToOutline = false; mCastsShadow = false; - mSharesGlobalCamera = false; + mUsesGlobalCamera = false; mAlpha = 1; mHasOverlappingRendering = true; mTranslationX = 0; diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index c3d9fd7..9487fae 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -196,8 +196,8 @@ public: mCastsShadow = castsShadow; } - void setSharesGlobalCamera(bool sharesGlobalCamera) { - mSharesGlobalCamera = sharesGlobalCamera; + void setUsesGlobalCamera(bool usesGlobalCamera) { + mUsesGlobalCamera = usesGlobalCamera; } void setProjectBackwards(bool shouldProject) { @@ -621,7 +621,7 @@ private: SkPath mOutline; bool mClipToOutline; bool mCastsShadow; - bool mSharesGlobalCamera; // TODO: respect value when rendering + bool mUsesGlobalCamera; // TODO: respect value when rendering float mAlpha; bool mHasOverlappingRendering; float mTranslationX, mTranslationY, mTranslationZ; |