Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of b68f5f09 to master

Browse Source 
Change-Id: Ib8dd3a353f40a3357c8dc5ac591cd5e3ab4d0a4b
This commit is contained in:
Kenny Root
2014-05-30 11:51:20 -07:00
parent 26e8f040ba b68f5f0932
commit 25e40de45f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/PathCache.cpp
View File

@@ -346,7 +346,7 @@ void PathCache::PathProcessor::onProcess(const sp<Task<SkBitmap*> >& task) {
float left, top, offset;
uint32_t width, height;
PathCache::computePathBounds(t->path, t->paint, left, top, offset, width, height);
PathCache::computePathBounds(t->path, &t->paint, left, top, offset, width, height);
PathTexture* texture = t->texture;
texture->left = left;
@@ -357,7 +357,7 @@ void PathCache::PathProcessor::onProcess(const sp<Task<SkBitmap*> >& task) {
if (width <= mMaxTextureSize && height <= mMaxTextureSize) {
SkBitmap* bitmap = new SkBitmap();
drawPath(t->path, t->paint, *bitmap, left, top, offset, width, height);
drawPath(t->path, &t->paint, *bitmap, left, top, offset, width, height);
t->setResult(bitmap);
} else {
texture->width = 0;

5
libs/hwui/PathCache.h
View File

@@ -293,7 +293,7 @@ private:
class PathTask: public Task<SkBitmap*> {
public:
PathTask(const SkPath* path, const SkPaint* paint, PathTexture* texture):
path(path), paint(paint), texture(texture) {
path(path), paint(*paint), texture(texture) {
}
~PathTask() {
@@ -301,7 +301,8 @@ private:
}
const SkPath* path;
const SkPaint* paint;
//copied, since input paint may not be immutable
const SkPaint paint;
PathTexture* texture;
};