4f1dae40e24d57d647db01443b8bf2410514b8b5 - platform/external/skia

commit	4f1dae40e24d57d647db01443b8bf2410514b8b5	[log] [tgz]
author	Derek Sollenberger <djsollen@google.com>	Tue Mar 06 09:06:43 2012 -0500
committer	Derek Sollenberger <derek@android.com>	Tue Mar 06 09:44:47 2012 -0500
tree	594df3f3fc6c1d90a76691a75763ae1beacfdf98
parent	1cab2921ab279367f8206cdadc9259d12e603548 [diff]

Skia Merge (revision 3312)

This CL also includes changes made to Android's copy of
Skia in their J release branch.

Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc

Android.mk[diff]
bench/Android.mk[diff]
bench/BenchGpuTimer_gl.cpp[diff]
bench/MutexBench.cpp[diff]
bench/PathBench.cpp[diff]
bench/PicturePlaybackBench.cpp[Added - diff]
bench/TextBench.cpp[diff]
bench/benchmain.cpp[diff]
gm/Android.mk[diff]
gm/convexpaths.cpp[Added - diff]
gm/gammatext.cpp[Added - diff]
gm/gmmain.cpp[diff]
gm/gradients.cpp[diff]
gm/morphology.cpp[Added - diff]
gm/patheffects.cpp[Added - diff]
gm/strokefill.cpp[diff]
gm/system_preferences.h[Added - diff]
gm/system_preferences_default.cpp[Added - diff]
gm/system_preferences_mac.mm[Added - diff]
gm/texdata.cpp[diff]
gyp/SampleApp.gyp[diff]
gyp/animator.gyp[diff]
gyp/bench.gypi[diff]
gyp/common_conditions.gypi[diff]
gyp/core.gyp[diff]
gyp/effects.gyp[diff]
gyp/gm.gyp[diff]
gyp/gmslides.gypi[diff]
gyp/gpu.gyp[diff]
gyp/iOSSampleApp.gyp[diff]
gyp/opts.gyp[diff]
gyp/ports.gyp[diff]
gyp/sfnt.gyp[Added - diff]
gyp/tests.gyp[diff]
gyp/utils.gyp[diff]
include/core/SkCanvas.h[diff]
include/core/SkColorPriv.h[diff]
include/core/SkDevice.h[diff]
include/core/SkDeviceProfile.h[Added - diff]
include/core/SkEndian.h[diff]
include/core/SkFlattenable.h[diff]
include/core/SkFontHost.h[diff]
include/core/SkImageFilter.h[diff]
include/core/SkPaint.h[diff]
include/core/SkPath.h[diff]
include/core/SkPathMeasure.h[diff]
include/core/SkPixelRef.h[diff]
include/core/SkPoint.h[diff]
include/core/SkRegion.h[diff]
include/core/SkScalerContext.h[diff]
include/core/SkStream.h[diff]
include/core/SkStroke.h[diff]
include/core/SkThread.h[diff]
include/core/SkThread_platform.h[diff]
include/core/SkUserConfig.h[diff]
include/effects/SkMorphologyImageFilter.h[Added - diff]
include/effects/SkTableColorFilter.h[diff]
include/effects/SkTestImageFilters.h[diff]
include/gpu/GrConfig.h[diff]
include/gpu/GrContext.h[diff]
include/gpu/GrGLConfig_chrome.h[Deleted - diff]
include/gpu/GrPaint.h[diff]
include/gpu/GrRenderTarget.h[diff]
include/gpu/GrSamplerState.h[diff]
include/gpu/GrTypes.h[diff]
include/gpu/SkGpuDevice.h[diff]
include/gpu/SkGrTexturePixelRef.h[diff]
include/gpu/gl/GrGLConfig.h[Renamed from include/gpu/GrGLConfig.h - diff]
include/gpu/gl/GrGLConfig_chrome.h[Added - diff]
include/gpu/gl/GrGLDefines.h[Renamed from include/gpu/GrGLDefines.h - diff]
include/gpu/gl/GrGLInterface.h[Renamed from include/gpu/GrGLInterface.h - diff]
include/gpu/gl/SkGLContext.h[Renamed from include/gpu/SkGLContext.h - diff]
include/gpu/gl/SkMesaGLContext.h[Renamed from include/gpu/SkMesaGLContext.h - diff]
include/gpu/gl/SkNativeGLContext.h[Renamed from include/gpu/SkNativeGLContext.h - diff]
include/gpu/gl/SkNullGLContext.h[Renamed from include/gpu/SkNullGLContext.h - diff]
include/pdf/SkPDFDevice.h[diff]
include/pdf/SkPDFFont.h[diff]
include/pdf/SkPDFGraphicState.h[diff]
include/pdf/SkPDFShader.h[diff]
include/utils/SkDeferredCanvas.h[Added - diff]
include/utils/SkDumpCanvas.h[diff]
include/utils/SkNWayCanvas.h[diff]
include/utils/SkProxyCanvas.h[diff]
include/utils/mac/SkCGUtils.h[diff]
samplecode/SampleApp.cpp[diff]
samplecode/SamplePath.cpp[diff]
samplecode/SampleTextOnPath.cpp[diff]
src/animator/SkDisplayEvent.cpp[diff]
src/core/SkAAClip.cpp[diff]
src/core/SkBitmap.cpp[diff]
src/core/SkBitmapProcState.h[diff]
src/core/SkBitmapProcState_matrixProcs.cpp[diff]
src/core/SkBitmapProcState_matrix_clamp.h[diff]
src/core/SkBitmapProcState_matrix_repeat.h[diff]
src/core/SkBlitMask.h[diff]
src/core/SkBlitMask_D32.cpp[diff]
src/core/SkBlitter.cpp[diff]
src/core/SkCanvas.cpp[diff]
src/core/SkConfig8888.cpp[Added - diff]
src/core/SkConfig8888.h[diff]
src/core/SkDevice.cpp[diff]
src/core/SkDeviceProfile.cpp[Added - diff]
src/core/SkDraw.cpp[diff]
src/core/SkDrawProcs.h[diff]
src/core/SkFlattenable.cpp[diff]
src/core/SkGeometry.cpp[diff]
src/core/SkMaskFilter.cpp[diff]
src/core/SkMemory_stdlib.cpp[diff]
src/core/SkPaint.cpp[diff]
src/core/SkPaintDefaults.h[Added - diff]
src/core/SkPath.cpp[diff]
src/core/SkPathEffect.cpp[diff]
src/core/SkPathMeasure.cpp[diff]
src/core/SkPicture.cpp[diff]
src/core/SkPictureFlat.h[diff]
src/core/SkPicturePlayback.cpp[diff]
src/core/SkPicturePlayback.h[diff]
src/core/SkPictureRecord.cpp[diff]
src/core/SkPictureRecord.h[diff]
src/core/SkPixelRef.cpp[diff]
src/core/SkRasterClip.cpp[diff]
src/core/SkRegion.cpp[diff]
src/core/SkScan_AntiPath.cpp[diff]
src/core/SkScan_Path.cpp[diff]
src/core/SkStroke.cpp[diff]
src/core/SkTextFormatParams.h[diff]
src/core/SkTypefaceCache.cpp[diff]
src/core/SkTypefaceCache.h[diff]
src/core/SkXfermode.cpp[diff]
src/effects/SkAvoidXfermode.cpp[diff]
src/effects/SkGradientShader.cpp[diff]
src/effects/SkLayerDrawLooper.cpp[diff]
src/effects/SkMorphologyImageFilter.cpp[Added - diff]
src/effects/SkTableMaskFilter.cpp[diff]
src/gpu/GrAAConvexPathRenderer.cpp[Added - diff]
src/gpu/GrAAConvexPathRenderer.h[Added - diff]
src/gpu/GrAAHairLinePathRenderer.cpp[diff]
src/gpu/GrAAHairLinePathRenderer.h[diff]
src/gpu/GrAddPathRenderers_default.cpp[Renamed from src/gpu/GrAddPathRenderers_aahairline.cpp - diff]
src/gpu/GrAtlas.cpp[diff]
src/gpu/GrBufferAllocPool.cpp[diff]
src/gpu/GrBufferAllocPool.h[diff]
src/gpu/GrContext.cpp[diff]
src/gpu/GrDefaultPathRenderer.cpp[diff]
src/gpu/GrDefaultPathRenderer.h[diff]
src/gpu/GrDrawState.h[diff]
src/gpu/GrDrawTarget.cpp[diff]
src/gpu/GrDrawTarget.h[diff]
src/gpu/GrGLSL.cpp[Deleted - diff]
src/gpu/GrGLSL.h[Deleted - diff]
src/gpu/GrGpu.cpp[diff]
src/gpu/GrGpu.h[diff]
src/gpu/GrGpuFactory.cpp[diff]
src/gpu/GrGpuVertex.h[diff]
src/gpu/GrInOrderDrawBuffer.cpp[diff]
src/gpu/GrInOrderDrawBuffer.h[diff]
src/gpu/GrPathRenderer.cpp[diff]
src/gpu/GrPathRenderer.h[diff]
src/gpu/GrPathRendererChain.cpp[diff]
src/gpu/GrPathRendererChain.h[diff]
src/gpu/GrPathUtils.cpp[diff]
src/gpu/GrPathUtils.h[diff]
src/gpu/GrRenderTarget.cpp[diff]
src/gpu/GrResourceCache.cpp[diff]
src/gpu/GrResourceCache.h[diff]
src/gpu/GrStencil.h[diff]
src/gpu/GrTesselatedPathRenderer.cpp[diff]
src/gpu/GrTesselatedPathRenderer.h[diff]
src/gpu/SkGpuDevice.cpp[diff]
src/gpu/SkGr.cpp[diff]
src/gpu/SkGrTexturePixelRef.cpp[diff]
src/gpu/android/GrGLCreateNativeInterface_android.cpp[diff]
src/gpu/android/SkNativeGLContext_android.cpp[diff]
src/gpu/app-android.cpp[diff]
src/gpu/gl/GrGLCaps.cpp[Added - diff]
src/gpu/gl/GrGLCaps.h[Added - diff]
src/gpu/gl/GrGLContextInfo.cpp[Added - diff]
src/gpu/gl/GrGLContextInfo.h[Added - diff]
src/gpu/gl/GrGLCreateNativeInterface_none.cpp[Renamed from src/gpu/GrGLCreateNativeInterface_none.cpp - diff]
src/gpu/gl/GrGLCreateNullInterface.cpp[Renamed from src/gpu/GrGLCreateNullInterface.cpp - diff]
src/gpu/gl/GrGLDefaultInterface_native.cpp[Renamed from src/gpu/GrGLDefaultInterface_native.cpp - diff]
src/gpu/gl/GrGLDefaultInterface_none.cpp[Renamed from src/gpu/GrGLDefaultInterface_none.cpp - diff]
src/gpu/gl/GrGLIRect.h[Renamed from src/gpu/GrGLIRect.h - diff]
src/gpu/gl/GrGLIndexBuffer.cpp[Renamed from src/gpu/GrGLIndexBuffer.cpp - diff]
src/gpu/gl/GrGLIndexBuffer.h[Renamed from src/gpu/GrGLIndexBuffer.h - diff]
src/gpu/gl/GrGLInterface.cpp[Renamed from src/gpu/GrGLInterface.cpp - diff]
src/gpu/gl/GrGLProgram.cpp[Renamed from src/gpu/GrGLProgram.cpp - diff]
src/gpu/gl/GrGLProgram.h[Renamed from src/gpu/GrGLProgram.h - diff]
src/gpu/gl/GrGLRenderTarget.cpp[Renamed from src/gpu/GrGLRenderTarget.cpp - diff]
src/gpu/gl/GrGLRenderTarget.h[Renamed from src/gpu/GrGLRenderTarget.h - diff]
src/gpu/gl/GrGLSL.cpp[Added - diff]
src/gpu/gl/GrGLSL.h[Added - diff]
src/gpu/gl/GrGLShaderVar.h[Renamed from src/gpu/GrGLShaderVar.h - diff]
src/gpu/gl/GrGLStencilBuffer.cpp[Renamed from src/gpu/GrGLStencilBuffer.cpp - diff]
src/gpu/gl/GrGLStencilBuffer.h[Renamed from src/gpu/GrGLStencilBuffer.h - diff]
src/gpu/gl/GrGLTexture.cpp[Renamed from src/gpu/GrGLTexture.cpp - diff]
src/gpu/gl/GrGLTexture.h[Renamed from src/gpu/GrGLTexture.h - diff]
src/gpu/gl/GrGLUtil.cpp[Renamed from src/gpu/GrGLUtil.cpp - diff]
src/gpu/gl/GrGLVertexBuffer.cpp[Renamed from src/gpu/GrGLVertexBuffer.cpp - diff]
src/gpu/gl/GrGLVertexBuffer.h[Renamed from src/gpu/GrGLVertexBuffer.h - diff]
src/gpu/gl/GrGpuGL.cpp[Renamed from src/gpu/GrGpuGL.cpp - diff]
src/gpu/gl/GrGpuGL.h[Renamed from src/gpu/GrGpuGL.h - diff]
src/gpu/gl/GrGpuGLShaders.cpp[Renamed from src/gpu/GrGpuGLShaders.cpp - diff]
src/gpu/gl/GrGpuGLShaders.h[Renamed from src/gpu/GrGpuGLShaders.h - diff]
src/gpu/gl/SkGLContext.cpp[Renamed from src/gpu/SkGLContext.cpp - diff]
src/gpu/gl/SkNullGLContext.cpp[Renamed from src/gpu/SkNullGLContext.cpp - diff]
src/gpu/gr_hello_world.cpp[diff]
src/gpu/ios/GrGLDefaultInterface_iOS.cpp[diff]
src/gpu/mac/GrGLCreateNativeInterface_mac.cpp[diff]
src/gpu/mac/SkNativeGLContext_mac.cpp[diff]
src/gpu/mesa/GrGLCreateMesaInterface.cpp[diff]
src/gpu/mesa/SkMesaGLContext.cpp[diff]
src/gpu/unix/GrGLCreateNativeInterface_unix.cpp[diff]
src/gpu/unix/SkNativeGLContext_unix.cpp[diff]
src/gpu/win/GrGLCreateNativeInterface_win.cpp[diff]
src/gpu/win/SkNativeGLContext_win.cpp[diff]
src/images/SkImageDecoder.cpp[diff]
src/images/SkImageRef.cpp[diff]
src/images/SkImageRef_GlobalPool.cpp[diff]
src/opts/SkBitmapProcState_opts_SSE2.cpp[diff]
src/opts/SkBitmapProcState_opts_SSE2.h[diff]
src/opts/SkBitmapProcState_opts_SSSE3.cpp[Added - diff]
src/opts/SkBitmapProcState_opts_SSSE3.h[Added - diff]
src/opts/SkBlitRow_opts_SSE2.cpp[diff]
src/opts/SkBlitRow_opts_SSE2.h[diff]
src/opts/SkBlitRow_opts_arm.cpp[diff]
src/opts/SkBlitRow_opts_none.cpp[diff]
src/opts/memset.arm.S[diff]
src/opts/opts_check_SSE2.cpp[diff]
src/opts/opts_check_arm.cpp[diff]
src/pdf/SkPDFFont.cpp[diff]
src/pdf/SkPDFGraphicState.cpp[diff]
src/pdf/SkPDFShader.cpp[diff]
src/pipe/SkGPipeWrite.cpp[diff]
src/ports/SkFontHost_FONTPATH.cpp[diff]
src/ports/SkFontHost_FreeType.cpp[diff]
src/ports/SkFontHost_android.cpp[diff]
src/ports/SkFontHost_fontconfig.cpp[diff]
src/ports/SkFontHost_freetype_mac.cpp[diff]
src/ports/SkFontHost_linux.cpp[diff]
src/ports/SkFontHost_mac_atsui.cpp[diff]
src/ports/SkFontHost_mac_coretext.cpp[diff]
src/ports/SkFontHost_none.cpp[diff]
src/ports/SkFontHost_simple.cpp[diff]
src/ports/SkFontHost_win.cpp[diff]
src/ports/SkImageDecoder_CG.cpp[diff]
src/ports/SkThread_none.cpp[diff]
src/ports/SkThread_pthread.cpp[diff]
src/ports/SkThread_win.cpp[diff]
src/svg/SkSVGCircle.cpp[diff]
src/svg/SkSVGEllipse.cpp[diff]
src/utils/SkBase64.cpp[Renamed from src/animator/SkBase64.cpp - diff]
src/utils/SkBase64.h[Renamed from src/animator/SkBase64.h - diff]
src/utils/SkDeferredCanvas.cpp[Added - diff]
src/utils/SkDumpCanvas.cpp[diff]
src/utils/SkNWayCanvas.cpp[diff]
src/views/SkEventSink.cpp[diff]
tests/AAClipTest.cpp[diff]
tests/Android.mk[diff]
tests/BitmapCopyTest.cpp[diff]
tests/CanvasTest.cpp[diff]
tests/ClipCubicTest.cpp[diff]
tests/ColorTest.cpp[diff]
tests/DeferredCanvasTest.cpp[Added - diff]
tests/DrawPathTest.cpp[Added - diff]
tests/DrawTextTest.cpp[Added - diff]
tests/FontHostTest.cpp[Added - diff]
tests/GLInterfaceValidation.cpp[diff]
tests/GLProgramsTest.cpp[diff]
tests/GeometryTest.cpp[diff]
tests/PathMeasureTest.cpp[diff]
tests/PathTest.cpp[diff]
tests/PremulAlphaRoundTripTest.cpp[Added - diff]
tests/ReadPixelsTest.cpp[diff]
tests/Test.cpp[diff]
tests/Test.h[diff]
tests/WArrayTest.cpp[diff]
tests/WritePixelsTest.cpp[diff]
third_party/glu/gluos.h[diff]

279 files changed

tree: 594df3f3fc6c1d90a76691a75763ae1beacfdf98