|
Revert "remvoe duplicate impl for SkImageInfo flattening"
Reason: breaks chrome_mac_tests which still have non-imageinfo constructors
This reverts commit a06b8cf60b39bda93e9ef1a73579007b2b930d29.
BUG=
Committed: https://code.google.com/p/skia/source/detail?r=12631
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+308 lines, -552 lines) |
Patch |
|
M |
include/core/SkBitmapDevice.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
include/core/SkMallocPixelRef.h
|
View
|
|
1 chunk |
+16 lines, -35 lines |
0 comments
|
Download
|
|
M |
include/core/SkPicture.h
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
include/core/SkPixelRef.h
|
View
|
|
4 chunks |
+19 lines, -57 lines |
0 comments
|
Download
|
|
M |
include/gpu/GrSurface.h
|
View
|
|
2 chunks |
+0 lines, -3 lines |
0 comments
|
Download
|
|
M |
include/gpu/SkGr.h
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
include/gpu/SkGrPixelRef.h
|
View
|
|
2 chunks |
+6 lines, -4 lines |
0 comments
|
Download
|
|
M |
include/images/SkImageRef.h
|
View
|
|
3 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
include/images/SkImageRef_GlobalPool.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
samplecode/SamplePicture.cpp
|
View
|
|
1 chunk |
+1 line, -3 lines |
0 comments
|
Download
|
|
M |
src/core/SkBitmap.cpp
|
View
|
|
2 chunks |
+9 lines, -21 lines |
0 comments
|
Download
|
|
M |
src/core/SkBitmapDevice.cpp
|
View
|
|
1 chunk |
+18 lines, -17 lines |
0 comments
|
Download
|
|
M |
src/core/SkImageFilterUtils.cpp
|
View
|
|
2 chunks |
+3 lines, -13 lines |
0 comments
|
Download
|
|
M |
src/core/SkMallocPixelRef.cpp
|
View
|
|
3 chunks |
+20 lines, -111 lines |
0 comments
|
Download
|
|
M |
src/core/SkMaskFilter.cpp
|
View
|
|
1 chunk |
+2 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/core/SkPixelRef.cpp
|
View
|
|
6 chunks |
+30 lines, -54 lines |
0 comments
|
Download
|
|
M |
src/effects/gradients/SkGradientShader.cpp
|
View
|
|
2 chunks |
+7 lines, -7 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrSurface.cpp
|
View
|
|
1 chunk |
+0 lines, -10 lines |
0 comments
|
Download
|
|
M |
src/gpu/SkGpuDevice.cpp
|
View
|
|
5 chunks |
+8 lines, -20 lines |
0 comments
|
Download
|
|
M |
src/gpu/SkGr.cpp
|
View
|
|
1 chunk |
+0 lines, -30 lines |
0 comments
|
Download
|
|
M |
src/gpu/SkGrPixelRef.cpp
|
View
|
|
3 chunks |
+26 lines, -25 lines |
0 comments
|
Download
|
|
M |
src/image/SkDataPixelRef.h
|
View
|
|
2 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
|
M |
src/image/SkDataPixelRef.cpp
|
View
|
|
2 chunks |
+7 lines, -18 lines |
0 comments
|
Download
|
|
M |
src/image/SkImage_Raster.cpp
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/image/SkSurface_Raster.cpp
|
View
|
|
1 chunk |
+13 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/images/SkImageRef.cpp
|
View
|
|
7 chunks |
+20 lines, -11 lines |
0 comments
|
Download
|
|
M |
src/images/SkImageRef_GlobalPool.cpp
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/images/SkImageRef_ashmem.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
src/images/SkImageRef_ashmem.cpp
|
View
|
|
1 chunk |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
src/lazy/SkCachingPixelRef.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/lazy/SkCachingPixelRef.cpp
|
View
|
|
5 chunks |
+15 lines, -19 lines |
0 comments
|
Download
|
|
M |
src/lazy/SkDiscardablePixelRef.h
|
View
|
|
3 chunks |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
src/lazy/SkDiscardablePixelRef.cpp
|
View
|
|
3 chunks |
+15 lines, -23 lines |
0 comments
|
Download
|
|
M |
tests/PictureTest.cpp
|
View
|
|
3 chunks |
+32 lines, -3 lines |
0 comments
|
Download
|
|
M |
tests/PixelRefTest.cpp
|
View
|
|
1 chunk |
+11 lines, -13 lines |
0 comments
|
Download
|
|
M |
tests/SerializationTest.cpp
|
View
|
|
2 chunks |
+3 lines, -16 lines |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|