diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-16 14:33:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 14:33:01 -0700 |
| commit | fe50b63f9b5b7e05754e3fba3ccce69b710dbafe (patch) | |
| tree | 23ca3fee10850afd65f5303d9fa637fbe11e94d5 /include | |
| parent | a486f554aa494dfeea4d63fde0d533ea9e1cfe2f (diff) | |
| parent | 7bb7e99216956d917af1786a3e02a92cac46fc84 (diff) | |
| download | frameworks_base-fe50b63f9b5b7e05754e3fba3ccce69b710dbafe.zip frameworks_base-fe50b63f9b5b7e05754e3fba3ccce69b710dbafe.tar.gz frameworks_base-fe50b63f9b5b7e05754e3fba3ccce69b710dbafe.tar.bz2 | |
am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2
* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
fix [2182249] [MR1] valgrind error in surface flinger
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/ui/RegionHelper.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h index 926fddb..8d76533 100644 --- a/include/private/ui/RegionHelper.h +++ b/include/private/ui/RegionHelper.h @@ -86,7 +86,7 @@ public: rasterizer(current); } } - } while(!spannerInner.isDone()); + } while(!spannerInner.isDone()); } while(!spanner.isDone()); } @@ -220,18 +220,21 @@ private: } inline void prepare(int inside) { - SpannerBase::lhs_head = lhs.rects->left + lhs.dx; - SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; - SpannerBase::rhs_head = rhs.rects->left + rhs.dx; - SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; if (inside == SpannerBase::lhs_before_rhs) { + SpannerBase::lhs_head = lhs.rects->left + lhs.dx; + SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; SpannerBase::rhs_head = max_value; SpannerBase::rhs_tail = max_value; } else if (inside == SpannerBase::lhs_after_rhs) { SpannerBase::lhs_head = max_value; SpannerBase::lhs_tail = max_value; + SpannerBase::rhs_head = rhs.rects->left + rhs.dx; + SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; } else { - // use both spans + SpannerBase::lhs_head = lhs.rects->left + lhs.dx; + SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; + SpannerBase::rhs_head = rhs.rects->left + rhs.dx; + SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; } } |