diff options
| author | 2014-05-14 14:17:01 -0700 | |
|---|---|---|
| committer | 2014-05-14 17:27:52 -0700 | |
| commit | a64a2bef1048db5a742843f1e3bea9e80d0defc5 (patch) | |
| tree | 7c66edd8039821862469a79602220a8041d01b10 /libs/hwui/Snapshot.cpp | |
| parent | a7e089f28c494f3c34e77f924b273acdbcf3ddd2 (diff) | |
Combine projection matrix, and viewport management
Merge management of ortho projection matrix with the viewport size,
since they should always be changed together.
Change-Id: Iccb8f30828f4fb7848999ac54852e7ed2d6f2eb1
Diffstat (limited to 'libs/hwui/Snapshot.cpp')
| -rw-r--r-- | libs/hwui/Snapshot.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp index 6bfa2033f8fc..029b56d6ae00 100644 --- a/libs/hwui/Snapshot.cpp +++ b/libs/hwui/Snapshot.cpp @@ -34,7 +34,6 @@ Snapshot::Snapshot() , fbo(0) , invisible(false) , empty(false) - , height(0) , alpha(1.0f) { transform = &mTransformRoot; clipRect = &mClipRectRoot; @@ -53,9 +52,8 @@ Snapshot::Snapshot(const sp<Snapshot>& s, int saveFlags) , fbo(s->fbo) , invisible(s->invisible) , empty(false) - , viewport(s->viewport) - , height(s->height) - , alpha(s->alpha) { + , alpha(s->alpha) + , mViewportData(s->mViewportData) { if (saveFlags & SkCanvas::kMatrix_SaveFlag) { mTransformRoot.load(*s->transform); @@ -215,7 +213,7 @@ bool Snapshot::isIgnored() const { void Snapshot::dump() const { ALOGD("Snapshot %p, flags %x, prev %p, height %d, ignored %d, hasComplexClip %d", - this, flags, previous.get(), height, isIgnored(), clipRegion && !clipRegion->isEmpty()); + this, flags, previous.get(), getViewportHeight(), isIgnored(), clipRegion && !clipRegion->isEmpty()); ALOGD(" ClipRect (at %p) %.1f %.1f %.1f %.1f", clipRect, clipRect->left, clipRect->top, clipRect->right, clipRect->bottom); ALOGD(" Transform (at %p):", transform); |