137a4ca42423bbb6d683067ea544c9a48f18f06c - platform/external/skia

commit	137a4ca42423bbb6d683067ea544c9a48f18f06c	[log] [tgz]
author	Derek Sollenberger <djsollen@google.com>	Thu Mar 17 15:18:13 2011 -0400
committer	Derek Sollenberger <djsollen@google.com>	Thu Mar 17 15:18:13 2011 -0400
tree	91758d54677b69a0256a076cf8ed209a84a601d0
parent	74620984a3d6d6d9ca2e564a487a00b987a9eb33 [diff]

Skia Merge (revision 950)

This merge will allow us to now import the sample app
infrastructure in skia to do on device measurements.

Change-Id: Idcab6b1524f371521717cde61a6e98a12d897e6b

Android.mk[diff]
gpu/include/GrAtlas.h[diff]
gpu/include/GrDrawTarget.h[diff]
gpu/include/GrFontScaler.h[diff]
gpu/include/GrGLConfig.h[diff]
gpu/include/GrGLConfig_chrome.h[diff]
gpu/include/GrGLInterface.h[Added - diff]
gpu/include/GrGLPlatformIncludes.h[Added - diff]
gpu/include/GrTextStrike.h[diff]
gpu/include/GrTexture.h[diff]
gpu/include/GrTypes.h[diff]
gpu/src/GrAtlas.cpp[diff]
gpu/src/GrGLIndexBuffer.cpp[diff]
gpu/src/GrGLInterface.cpp[Added - diff]
gpu/src/GrGLTexture.cpp[diff]
gpu/src/GrGLUtil.cpp[diff]
gpu/src/GrGLVertexBuffer.cpp[diff]
gpu/src/GrGpu.cpp[diff]
gpu/src/GrGpuFactory.cpp[diff]
gpu/src/GrGpuGL.cpp[diff]
gpu/src/GrGpuGL.h[diff]
gpu/src/GrGpuGLFixed.cpp[diff]
gpu/src/GrTextContext.cpp[diff]
gpu/src/GrTextStrike.cpp[diff]
gpu/src/gr_files.mk[diff]
include/config/SkUserConfig.h[Added - diff]
include/core/SkBitmap.h[diff]
include/core/SkCanvas.h[diff]
include/core/SkClipStack.h[diff]
include/core/SkColor.h[diff]
include/core/SkColorPriv.h[diff]
include/core/SkColorShader.h[diff]
include/core/SkDeque.h[diff]
include/core/SkDevice.h[diff]
include/core/SkDrawLooper.h[diff]
include/core/SkFlattenable.h[diff]
include/core/SkFloatBits.h[diff]
include/core/SkGeometry.h[diff]
include/core/SkMask.h[diff]
include/core/SkMatrix.h[diff]
include/core/SkPaint.h[diff]
include/core/SkPath.h[diff]
include/core/SkPathEffect.h[diff]
include/core/SkPoint.h[diff]
include/core/SkPreConfig.h[diff]
include/core/SkRect.h[diff]
include/core/SkRefCnt.h[diff]
include/core/SkRefDict.h[diff]
include/core/SkRegion.h[diff]
include/core/SkScalerContext.h[diff]
include/core/SkShader.h[diff]
include/core/SkTDArray.h[diff]
include/core/SkTypeface.h[diff]
include/core/SkTypes.h[diff]
include/core/SkUnPreMultiply.h[diff]
include/core/SkXfermode.h[diff]
include/effects/SkBlurDrawLooper.h[diff]
include/effects/SkCornerPathEffect.h[diff]
include/effects/SkDashPathEffect.h[diff]
include/effects/SkGradientShader.h[diff]
include/gpu/SkGpuDevice.h[diff]
include/gpu/SkGr.h[diff]
include/ports/SkTypeface_win.h[diff]
src/core/SkBitmapProcState_filter.h[diff]
src/core/SkCanvas.cpp[diff]
src/core/SkDevice.cpp[diff]
src/core/SkGlyphCache.h[diff]
src/core/SkPaint.cpp[diff]
src/core/core_files.mk[Added - diff]
src/effects/SkBlurDrawLooper.cpp[diff]
src/effects/effects_files.mk[Added - diff]
src/gpu/SkGpuDevice.cpp[diff]
src/gpu/SkGrFontScaler.cpp[diff]
src/ports/SkFontHost_FreeType.cpp[diff]
src/ports/SkFontHost_simple.cpp[diff]
src/ports/SkFontHost_win.cpp[diff]
src/utils/utils_files.mk[Added - diff]
tests/tests_files.mk[Added - diff]

78 files changed

tree: 91758d54677b69a0256a076cf8ed209a84a601d0

bench/
emoji/
gm/
gpu/
include/
src/
tests/
Android.mk
CleanSpec.mk
MODULE_LICENSE_APACHE2
NOTICE
ThirdPartyProject.prop