c3bd8af6d5722e854feca70c40d92f4954c5b67b - fp2-dev/platform/external/chromium_org/third_party/skia

commit	c3bd8af6d5722e854feca70c40d92f4954c5b67b	[log] [tgz]
author	commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>	Thu Feb 13 17:14:46 2014 +0000
committer	commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>	Thu Feb 13 17:14:46 2014 +0000
tree	d66f5fa5e139469c523882685cd1dfb4c8f83529
parent	e1df56579f815fe1f788380e9342abe5284bab51 [diff]

add peekPixels to SkCanvas and SkSurface

fix reference to SkBaseDevice, which was only a problem in no-gpu build

This reverts commit 4fa44a6bf73891b21917fb90d02beef9143bffa3.

R=reed@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/163603003

git-svn-id: http://skia.googlecode.com/svn/trunk@13432 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/aaclip.cpp[diff]
gm/bitmapcopy.cpp[diff]
gm/bitmapsource.cpp[diff]
gm/deviceproperties.cpp[diff]
gm/displacement.cpp[diff]
gm/gammatext.cpp[diff]
gm/gm.h[diff]
gm/imagefiltersclipped.cpp[diff]
gm/imagefiltersgraph.cpp[diff]
gm/imagefiltersscaled.cpp[diff]
gm/lighting.cpp[diff]
gm/matrixconvolution.cpp[diff]
gm/morphology.cpp[diff]
gm/ninepatchstretch.cpp[diff]
gm/offsetimagefilter.cpp[diff]
gm/peekpixels.cpp[Added - diff]
gm/tileimagefilter.cpp[diff]
gm/xfermodeimagefilter.cpp[diff]
gm/xfermodes3.cpp[diff]
gyp/gmslides.gypi[diff]
include/core/SkBitmap.h[diff]
include/core/SkBitmapDevice.h[diff]
include/core/SkCanvas.h[diff]
include/core/SkDevice.h[diff]
include/core/SkSurface.h[diff]
samplecode/SampleApp.cpp[diff]
samplecode/SampleCircle.cpp[diff]
samplecode/SampleLayers.cpp[diff]
src/core/SkBitmapDevice.cpp[diff]
src/core/SkCanvas.cpp[diff]
src/core/SkDevice.cpp[diff]
src/core/SkPictureRecord.h[diff]
src/image/SkImagePriv.h[diff]
src/image/SkSurface.cpp[diff]
tests/SkpSkGrTest.cpp[diff]
tests/SurfaceTest.cpp[diff]

36 files changed