[PATCH 1/5] Update Skia to r13827

From df825e84cb147c1599ef1c4691cb3948a3af3522 Mon Sep 17 00:00:00 2001
---
 gfx/skia/README_MOZILLA                            |   2 +-
 gfx/skia/generate_mozbuild.py                      |   2 +-
 gfx/skia/moz.build                                 |  15 +-
 gfx/skia/trunk/include/core/Sk64.h                 | 230 ------
 gfx/skia/trunk/include/core/SkAnnotation.h         |  13 +-
 gfx/skia/trunk/include/core/SkBitmap.h             |  65 +-
 gfx/skia/trunk/include/core/SkBitmapDevice.h       |  39 +-
 gfx/skia/trunk/include/core/SkCanvas.h             | 422 ++++++++--
 gfx/skia/trunk/include/core/SkClipStack.h          | 100 ++-
 gfx/skia/trunk/include/core/SkColorFilter.h        |   2 +-
 gfx/skia/trunk/include/core/SkColorShader.h        |   2 +-
 gfx/skia/trunk/include/core/SkComposeShader.h      |   2 +-
 gfx/skia/trunk/include/core/SkDevice.h             | 117 ++-
 gfx/skia/trunk/include/core/SkDrawLooper.h         |  59 +-
 gfx/skia/trunk/include/core/SkEmptyShader.h        |   2 +-
 gfx/skia/trunk/include/core/SkGeometry.h           |   9 +
 gfx/skia/trunk/include/core/SkImageFilter.h        |  60 +-
 gfx/skia/trunk/include/core/SkImageFilterUtils.h   |  38 -
 gfx/skia/trunk/include/core/SkImageInfo.h          |   7 +
 gfx/skia/trunk/include/core/SkMaskFilter.h         |  13 +-
 gfx/skia/trunk/include/core/SkMatrix.h             |   2 +-
 gfx/skia/trunk/include/core/SkPaint.h              | 100 ++-
 gfx/skia/trunk/include/core/SkPathEffect.h         |  27 +-
 gfx/skia/trunk/include/core/SkPicture.h            |  88 +-
 gfx/skia/trunk/include/core/SkPreConfig.h          |  32 +-
 gfx/skia/trunk/include/core/SkRRect.h              |  31 +-
 gfx/skia/trunk/include/core/SkRasterizer.h         |   3 +-
 gfx/skia/trunk/include/core/SkReadBuffer.h         |   4 +-
 gfx/skia/trunk/include/core/SkScalarCompare.h      |  38 -
 gfx/skia/trunk/include/core/SkShader.h             |   7 +-
 gfx/skia/trunk/include/core/SkStream.h             |  18 +-
 gfx/skia/trunk/include/core/SkSurface.h            |  17 +-
 gfx/skia/trunk/include/core/SkTDArray.h            |  40 +-
 gfx/skia/trunk/include/core/SkTLazy.h              |  10 +
 gfx/skia/trunk/include/core/SkTemplates.h          |  11 +
 gfx/skia/trunk/include/core/SkThread_platform.h    | 194 -----
 gfx/skia/trunk/include/core/SkTypes.h              |  29 +-
 gfx/skia/trunk/include/core/SkWriter32.h           |  39 +-
 gfx/skia/trunk/include/core/SkXfermode.h           |  20 +-
 gfx/skia/trunk/include/device/xps/SkXPSDevice.h    |   8 +-
 gfx/skia/trunk/include/effects/Sk1DPathEffect.h    |  10 +-
 gfx/skia/trunk/include/effects/Sk2DPathEffect.h    |  29 +-
 gfx/skia/trunk/include/effects/SkAvoidXfermode.h   |  11 +-
 .../trunk/include/effects/SkBicubicImageFilter.h   |  18 +-
 .../include/effects/SkBitmapAlphaThresholdShader.h |  24 -
 gfx/skia/trunk/include/effects/SkBitmapSource.h    |  17 +-
 gfx/skia/trunk/include/effects/SkBlurDrawLooper.h  |  20 +-
 gfx/skia/trunk/include/effects/SkBlurImageFilter.h |  23 +-
 .../include/effects/SkColorFilterImageFilter.h     |   2 +-
 .../trunk/include/effects/SkColorMatrixFilter.h    |  16 +-
 .../trunk/include/effects/SkComposeImageFilter.h   |  12 +-
 .../trunk/include/effects/SkCornerPathEffect.h     |   9 +-
 gfx/skia/trunk/include/effects/SkDashPathEffect.h  |  12 +-
 .../trunk/include/effects/SkDiscretePathEffect.h   |   9 +-
 .../include/effects/SkDisplacementMapEffect.h      |  31 +-
 .../include/effects/SkDropShadowImageFilter.h      |  23 +-
 .../trunk/include/effects/SkEmbossMaskFilter.h     |  14 +-
 .../trunk/include/effects/SkKernel33MaskFilter.h   |  25 +-
 gfx/skia/trunk/include/effects/SkLayerDrawLooper.h |  79 +-
 gfx/skia/trunk/include/effects/SkLayerRasterizer.h |  44 +-
 gfx/skia/trunk/include/effects/SkLerpXfermode.h    |   2 +-
 gfx/skia/trunk/include/effects/SkLumaColorFilter.h |   2 +-
 .../trunk/include/effects/SkMagnifierImageFilter.h |  11 +-
 .../effects/SkMatrixConvolutionImageFilter.h       |  81 +-
 .../trunk/include/effects/SkMergeImageFilter.h     |  29 +-
 .../include/effects/SkMorphologyImageFilter.h      |  49 +-
 .../trunk/include/effects/SkOffsetImageFilter.h    |  14 +-
 .../trunk/include/effects/SkPerlinNoiseShader.h    |  36 +-
 .../trunk/include/effects/SkPictureImageFilter.h   |  20 +-
 .../trunk/include/effects/SkPixelXorXfermode.h     |  11 +-
 .../include/effects/SkRectShaderImageFilter.h      |   2 +-
 .../trunk/include/effects/SkResizeImageFilter.h    |  20 +-
 .../trunk/include/effects/SkStippleMaskFilter.h    |  11 +-
 gfx/skia/trunk/include/effects/SkTableMaskFilter.h |  14 +-
 .../trunk/include/effects/SkTestImageFilters.h     |   7 +-
 gfx/skia/trunk/include/effects/SkTileImageFilter.h |  16 +-
 .../trunk/include/effects/SkTransparentShader.h    |   2 +-
 .../trunk/include/effects/SkXfermodeImageFilter.h  |  19 +-
 gfx/skia/trunk/include/gpu/GrBitmapTextContext.h   |  46 --
 gfx/skia/trunk/include/gpu/GrContext.h             |  13 +
 .../trunk/include/gpu/GrDistanceFieldTextContext.h |  46 --
 .../trunk/include/gpu/GrTBackendEffectFactory.h    |   2 +-
 gfx/skia/trunk/include/gpu/GrTextContext.h         |  40 -
 gfx/skia/trunk/include/gpu/GrTypesPriv.h           |  51 ++
 gfx/skia/trunk/include/gpu/SkGpuDevice.h           |  40 +-
 gfx/skia/trunk/include/gpu/SkGr.h                  |   1 +
 gfx/skia/trunk/include/gpu/gl/GrGLExtensions.h     |   7 +-
 gfx/skia/trunk/include/gpu/gl/GrGLFunctions.h      |  12 +-
 gfx/skia/trunk/include/gpu/gl/GrGLInterface.h      | 218 +----
 gfx/skia/trunk/include/pdf/SkPDFDevice.h           |   7 +-
 gfx/skia/trunk/include/utils/SkDeferredCanvas.h    |  44 +-
 gfx/skia/trunk/include/utils/SkDumpCanvas.h        |  46 +-
 gfx/skia/trunk/include/utils/SkLua.h               |   6 +
 gfx/skia/trunk/include/utils/SkLuaCanvas.h         |  37 +-
 gfx/skia/trunk/include/utils/SkNWayCanvas.h        |  33 +-
 gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h |  47 ++
 gfx/skia/trunk/include/utils/SkProxyCanvas.h       |  37 +-
 gfx/skia/trunk/include/utils/SkRunnable.h          |  14 +-
 gfx/skia/trunk/include/utils/SkThreadPool.h        | 161 +++-
 gfx/skia/trunk/include/views/SkWindow.h            |   6 +-
 gfx/skia/trunk/src/animator/SkDisplayType.cpp      |   2 +-
 gfx/skia/trunk/src/animator/SkDrawDash.cpp         |   2 +-
 gfx/skia/trunk/src/animator/SkDrawDiscrete.cpp     |   2 +-
 .../trunk/src/animator/SkDrawExtraPathEffect.cpp   |   4 +-
 gfx/skia/trunk/src/core/Sk64.cpp                   | 345 --------
 gfx/skia/trunk/src/core/SkAnnotation.cpp           |   2 +-
 gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.cpp  |  82 +-
 gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.h    |  44 +-
 gfx/skia/trunk/src/core/SkBBoxRecord.cpp           |   7 +
 gfx/skia/trunk/src/core/SkBBoxRecord.h             |   6 +-
 gfx/skia/trunk/src/core/SkBitmap.cpp               | 100 ++-
 gfx/skia/trunk/src/core/SkBitmapDevice.cpp         | 219 ++++-
 gfx/skia/trunk/src/core/SkBitmapFilter.cpp         |   4 +-
 gfx/skia/trunk/src/core/SkBitmapHeap.cpp           |   2 +-
 gfx/skia/trunk/src/core/SkBitmapHeap.h             |   2 +-
 gfx/skia/trunk/src/core/SkBitmapProcShader.cpp     |  61 +-
 gfx/skia/trunk/src/core/SkBitmapProcShader.h       |  13 +-
 gfx/skia/trunk/src/core/SkBitmapScaler.cpp         |  23 +-
 gfx/skia/trunk/src/core/SkBitmap_scroll.cpp        |  22 +-
 gfx/skia/trunk/src/core/SkBlitter.cpp              | 126 +--
 gfx/skia/trunk/src/core/SkBlitter.h                |  15 +-
 gfx/skia/trunk/src/core/SkBlitter_RGB16.cpp        |  25 +-
 gfx/skia/trunk/src/core/SkBlitter_Sprite.cpp       |  23 +-
 gfx/skia/trunk/src/core/SkCanvas.cpp               | 668 +++++++++++----
 gfx/skia/trunk/src/core/SkClipStack.cpp            | 290 ++++---
 gfx/skia/trunk/src/core/SkComposeShader.cpp        |   2 +-
 gfx/skia/trunk/src/core/SkConfig8888.h             |   5 +-
 gfx/skia/trunk/src/core/SkCordic.cpp               | 289 -------
 gfx/skia/trunk/src/core/SkCordic.h                 |  28 -
 gfx/skia/trunk/src/core/SkCoreBlitters.h           |   8 +-
 gfx/skia/trunk/src/core/SkDebug.cpp                |   5 +
 gfx/skia/trunk/src/core/SkDevice.cpp               | 123 ++-
 gfx/skia/trunk/src/core/SkDeviceImageFilterProxy.h |   7 +-
 gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp     | 451 ++++++++++
 gfx/skia/trunk/src/core/SkDistanceFieldGen.h       |  25 +
 gfx/skia/trunk/src/core/SkDraw.cpp                 |  99 +--
 gfx/skia/trunk/src/core/SkDrawLooper.cpp           |  17 +-
 gfx/skia/trunk/src/core/SkFP.h                     |  79 --
 gfx/skia/trunk/src/core/SkFilterShader.cpp         |   2 +-
 gfx/skia/trunk/src/core/SkFilterShader.h           |   2 +-
 gfx/skia/trunk/src/core/SkFlattenableBuffers.cpp   | 116 ---
 gfx/skia/trunk/src/core/SkGeometry.cpp             | 454 +++++-----
 gfx/skia/trunk/src/core/SkImageFilter.cpp          | 123 ++-
 gfx/skia/trunk/src/core/SkImageFilterUtils.cpp     |  55 --
 gfx/skia/trunk/src/core/SkMaskFilter.cpp           |   7 +
 gfx/skia/trunk/src/core/SkMatrix.cpp               |   2 +
 gfx/skia/trunk/src/core/SkMatrixClipStateMgr.cpp   | 258 ++++--
 gfx/skia/trunk/src/core/SkMatrixClipStateMgr.h     |  89 +-
 gfx/skia/trunk/src/core/SkOffsetTable.h            | 115 +++
 gfx/skia/trunk/src/core/SkOrderedReadBuffer.cpp    | 317 -------
 gfx/skia/trunk/src/core/SkOrderedWriteBuffer.cpp   | 319 --------
 gfx/skia/trunk/src/core/SkOrderedWriteBuffer.h     | 117 ---
 gfx/skia/trunk/src/core/SkPaint.cpp                | 206 +++--
 gfx/skia/trunk/src/core/SkPathHeap.cpp             |  33 +
 gfx/skia/trunk/src/core/SkPathHeap.h               |  26 +
 gfx/skia/trunk/src/core/SkPicture.cpp              | 125 +--
 gfx/skia/trunk/src/core/SkPictureFlat.h            |  27 +-
 gfx/skia/trunk/src/core/SkPicturePlayback.cpp      | 345 +++++---
 gfx/skia/trunk/src/core/SkPicturePlayback.h        |  20 +
 gfx/skia/trunk/src/core/SkPictureRecord.cpp        | 240 ++++--
 gfx/skia/trunk/src/core/SkPictureRecord.h          |  58 +-
 gfx/skia/trunk/src/core/SkQuadTree.cpp             | 340 ++++----
 gfx/skia/trunk/src/core/SkQuadTree.h               |  57 +-
 gfx/skia/trunk/src/core/SkQuadTreePicture.cpp      |   2 +-
 gfx/skia/trunk/src/core/SkRRect.cpp                |   7 +
 gfx/skia/trunk/src/core/SkScaledImageCache.cpp     |   8 +-
 gfx/skia/trunk/src/core/SkScalerContext.cpp        |   6 +-
 gfx/skia/trunk/src/core/SkShader.cpp               |  16 +-
 gfx/skia/trunk/src/core/SkSmallAllocator.h         | 149 ++++
 gfx/skia/trunk/src/core/SkSpriteBlitter.h          |   9 +-
 gfx/skia/trunk/src/core/SkSpriteBlitter_ARGB32.cpp |  30 +-
 gfx/skia/trunk/src/core/SkSpriteBlitter_RGB16.cpp  |  46 +-
 gfx/skia/trunk/src/core/SkStream.cpp               |  29 +-
 gfx/skia/trunk/src/core/SkTDynamicHash.h           |  27 +
 gfx/skia/trunk/src/core/SkTInternalSList.h         | 132 +++
 gfx/skia/trunk/src/core/SkTLList.h                 |   4 +-
 gfx/skia/trunk/src/core/SkTObjectPool.h            | 104 +++
 gfx/skia/trunk/src/core/SkTRefArray.h              |   0
 gfx/skia/trunk/src/core/SkTemplatesPriv.h          |  76 --
 gfx/skia/trunk/src/core/SkValidatingReadBuffer.cpp |   4 +-
 gfx/skia/trunk/src/core/SkValidatingReadBuffer.h   |   1 -
 gfx/skia/trunk/src/core/SkWriteBuffer.cpp          |  11 +-
 gfx/skia/trunk/src/core/SkWriter32.cpp             |  40 +-
 gfx/skia/trunk/src/core/SkXfermode.cpp             |  50 +-
 gfx/skia/trunk/src/core/SkXfermode_proccoeff.h     |  18 +-
 gfx/skia/trunk/src/device/xps/SkXPSDevice.cpp      |  13 +-
 .../trunk/src/effects/SkAlphaThresholdFilter.cpp   |  10 +-
 gfx/skia/trunk/src/effects/SkArithmeticMode.cpp    |  21 +-
 gfx/skia/trunk/src/effects/SkAvoidXfermode.cpp     |   2 +-
 .../trunk/src/effects/SkBicubicImageFilter.cpp     |  16 +-
 .../src/effects/SkBitmapAlphaThresholdShader.cpp   | 277 -------
 gfx/skia/trunk/src/effects/SkBitmapSource.cpp      |   6 +-
 gfx/skia/trunk/src/effects/SkBlurDrawLooper.cpp    |  28 +-
 gfx/skia/trunk/src/effects/SkBlurImageFilter.cpp   |  38 +-
 gfx/skia/trunk/src/effects/SkBlurMask.cpp          |  27 +-
 gfx/skia/trunk/src/effects/SkBlurMask.h            |  23 +-
 gfx/skia/trunk/src/effects/SkBlurMaskFilter.cpp    |  83 +-
 .../trunk/src/effects/SkColorFilterImageFilter.cpp |  10 +-
 gfx/skia/trunk/src/effects/SkColorFilters.cpp      |   4 +-
 gfx/skia/trunk/src/effects/SkColorMatrix.cpp       |   3 -
 gfx/skia/trunk/src/effects/SkColorMatrixFilter.cpp |   3 +-
 .../trunk/src/effects/SkComposeImageFilter.cpp     |   8 +-
 gfx/skia/trunk/src/effects/SkDashPathEffect.cpp    |   4 +-
 .../trunk/src/effects/SkDisplacementMapEffect.cpp  |  97 +--
 .../trunk/src/effects/SkDropShadowImageFilter.cpp  |  17 +-
 gfx/skia/trunk/src/effects/SkEmbossMaskFilter.cpp  |  11 +-
 .../trunk/src/effects/SkKernel33MaskFilter.cpp     |   4 +-
 gfx/skia/trunk/src/effects/SkLayerDrawLooper.cpp   | 154 ++--
 gfx/skia/trunk/src/effects/SkLayerRasterizer.cpp   |  65 +-
 gfx/skia/trunk/src/effects/SkLerpXfermode.cpp      |   2 +-
 .../trunk/src/effects/SkLightingImageFilter.cpp    |  63 +-
 gfx/skia/trunk/src/effects/SkLumaColorFilter.cpp   |   2 +-
 .../trunk/src/effects/SkMagnifierImageFilter.cpp   |   8 +-
 .../src/effects/SkMatrixConvolutionImageFilter.cpp |  72 +-
 gfx/skia/trunk/src/effects/SkMergeImageFilter.cpp  |   7 +-
 .../trunk/src/effects/SkMorphologyImageFilter.cpp  |  44 +-
 gfx/skia/trunk/src/effects/SkOffsetImageFilter.cpp |  24 +-
 gfx/skia/trunk/src/effects/SkPerlinNoiseShader.cpp | 134 ++-
 .../trunk/src/effects/SkPictureImageFilter.cpp     |  20 +-
 gfx/skia/trunk/src/effects/SkPixelXorXfermode.cpp  |   2 +-
 .../trunk/src/effects/SkRectShaderImageFilter.cpp  |   9 +-
 gfx/skia/trunk/src/effects/SkResizeImageFilter.cpp |  45 +-
 gfx/skia/trunk/src/effects/SkStippleMaskFilter.cpp |   2 +-
 gfx/skia/trunk/src/effects/SkTableColorFilter.cpp  |   4 +-
 gfx/skia/trunk/src/effects/SkTableMaskFilter.cpp   |   2 +-
 gfx/skia/trunk/src/effects/SkTestImageFilters.cpp  |   2 +-
 gfx/skia/trunk/src/effects/SkTileImageFilter.cpp   |   8 +-
 gfx/skia/trunk/src/effects/SkTransparentShader.cpp |  24 +-
 .../trunk/src/effects/SkXfermodeImageFilter.cpp    |  35 +-
 .../src/effects/gradients/SkGradientShader.cpp     |   8 +-
 .../src/effects/gradients/SkGradientShaderPriv.h   |   2 +-
 .../src/effects/gradients/SkLinearGradient.cpp     |   2 +-
 .../trunk/src/effects/gradients/SkLinearGradient.h |   2 +-
 .../src/effects/gradients/SkRadialGradient.cpp     |   2 +-
 .../trunk/src/effects/gradients/SkRadialGradient.h |   2 +-
 .../src/effects/gradients/SkSweepGradient.cpp      |  14 +-
 .../trunk/src/effects/gradients/SkSweepGradient.h  |   2 +-
 .../gradients/SkTwoPointConicalGradient.cpp        |   2 +-
 .../effects/gradients/SkTwoPointConicalGradient.h  |   2 +-
 .../effects/gradients/SkTwoPointRadialGradient.cpp |   2 +-
 .../effects/gradients/SkTwoPointRadialGradient.h   |   2 +-
 .../trunk/src/gpu/GrAAHairLinePathRenderer.cpp     |   4 +-
 gfx/skia/trunk/src/gpu/GrAllocator.h               |   0
 gfx/skia/trunk/src/gpu/GrAtlas.cpp                 | 184 ++---
 gfx/skia/trunk/src/gpu/GrAtlas.h                   |  37 +-
 gfx/skia/trunk/src/gpu/GrBitmapTextContext.cpp     |  19 +-
 gfx/skia/trunk/src/gpu/GrClipMaskManager.cpp       | 283 ++++---
 gfx/skia/trunk/src/gpu/GrClipMaskManager.h         |   7 +
 gfx/skia/trunk/src/gpu/GrContext.cpp               |  17 +
 .../trunk/src/gpu/GrDistanceFieldTextContext.cpp   |  34 +-
 gfx/skia/trunk/src/gpu/GrDrawTarget.cpp            |  28 +-
 gfx/skia/trunk/src/gpu/GrDrawTarget.h              |  20 +
 gfx/skia/trunk/src/gpu/GrDrawTargetCaps.h          |   2 +
 gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.cpp     |  12 +
 gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.h       |   5 +
 gfx/skia/trunk/src/gpu/GrOrderedSet.h              | 154 ++++
 gfx/skia/trunk/src/gpu/GrRedBlackTree.h            |   5 +
 gfx/skia/trunk/src/gpu/GrReducedClip.cpp           |  18 +-
 gfx/skia/trunk/src/gpu/GrReducedClip.h             |  15 +-
 gfx/skia/trunk/src/gpu/GrTextStrike.cpp            | 190 ++---
 gfx/skia/trunk/src/gpu/GrTextStrike.h              |  22 +-
 gfx/skia/trunk/src/gpu/GrTextStrike_impl.h         |   6 -
 gfx/skia/trunk/src/gpu/SkGpuDevice.cpp             | 220 +++--
 gfx/skia/trunk/src/gpu/SkGr.cpp                    |  25 +-
 gfx/skia/trunk/src/gpu/effects/GrBezierEffect.cpp  |  63 +-
 gfx/skia/trunk/src/gpu/effects/GrBezierEffect.h    | 162 ++--
 .../trunk/src/gpu/effects/GrConvexPolyEffect.cpp   | 112 ++-
 .../trunk/src/gpu/effects/GrConvexPolyEffect.h     |  30 +-
 .../gpu/effects/GrDistanceFieldTextureEffect.cpp   |  72 +-
 .../src/gpu/effects/GrDistanceFieldTextureEffect.h |  11 +-
 gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp   | 721 ++++++++++++++++
 gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h     |  25 +
 .../src/gpu/effects/GrTextureDomainEffect.cpp      | 221 -----
 .../trunk/src/gpu/effects/GrTextureDomainEffect.h  |  89 --
 gfx/skia/trunk/src/gpu/gl/GrGLCaps.cpp             |   2 +
 .../trunk/src/gpu/gl/GrGLCreateNullInterface.cpp   | 287 ++++---
 gfx/skia/trunk/src/gpu/gl/GrGLExtensions.cpp       |  11 +
 gfx/skia/trunk/src/gpu/gl/GrGLInterface.cpp        | 331 ++------
 gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.cpp    |  16 +-
 gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.h      |  10 +-
 gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.cpp    |  11 +-
 gfx/skia/trunk/src/gpu/gl/GrGLUtil.cpp             |   2 +-
 gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.cpp      |  63 +-
 gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.h        |  25 +-
 gfx/skia/trunk/src/gpu/gl/GrGpuGL.cpp              |  19 +-
 gfx/skia/trunk/src/gpu/gl/GrGpuGL.h                |   6 +
 gfx/skia/trunk/src/gpu/gl/GrGpuGL_program.cpp      |  38 +-
 .../android/GrGLCreateNativeInterface_android.cpp  |  17 +-
 .../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp  |   6 +
 .../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp  |  15 +-
 .../gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp   |   6 +
 .../gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp   |  11 +-
 .../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp    |  11 +-
 .../gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp |  11 +-
 .../gpu/gl/win/GrGLCreateNativeInterface_win.cpp   |  11 +-
 gfx/skia/trunk/src/image/SkDataPixelRef.cpp        |  43 -
 gfx/skia/trunk/src/image/SkDataPixelRef.h          |  36 -
 gfx/skia/trunk/src/image/SkImagePriv.h             |   2 -
 gfx/skia/trunk/src/image/SkImage_Gpu.cpp           |   2 +-
 gfx/skia/trunk/src/image/SkImage_Raster.cpp        |   2 +-
 gfx/skia/trunk/src/image/SkSurface.cpp             |   4 +
 gfx/skia/trunk/src/image/SkSurface_Gpu.cpp         |  31 +-
 gfx/skia/trunk/src/image/SkSurface_Raster.cpp      |   2 +-
 .../trunk/src/images/SkDecodingImageGenerator.cpp  | 102 +--
 .../trunk/src/images/SkDecodingImageGenerator.h    |   5 +-
 .../trunk/src/images/SkImageDecoder_libpng.cpp     |  15 +-
 .../trunk/src/images/SkImageDecoder_libwebp.cpp    |  93 ++-
 gfx/skia/trunk/src/images/SkImageRef.cpp           |  13 +
 gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.cpp  |   2 +-
 .../src/opts/SkBitmapProcState_matrix_clamp_neon.h | 911 ---------------------
 .../trunk/src/opts/SkBitmapProcState_matrix_neon.h | 105 +--
 .../opts/SkBitmapProcState_matrix_repeat_neon.h    | 542 ------------
 .../src/opts/SkBitmapProcState_opts_SSSE3.cpp      |  38 +-
 gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.cpp    | 511 ++++++++++++
 gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.h      |  13 +
 .../trunk/src/opts/SkBlitRow_opts_arm_neon.cpp     | 511 ++++++------
 gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h        |  31 +
 .../trunk/src/opts/SkXfermode_opts_arm_neon.cpp    |   2 +-
 gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.h |   2 +-
 gfx/skia/trunk/src/opts/opts_check_SSE2.cpp        |  17 +-
 gfx/skia/trunk/src/pathops/SkDCubicToQuads.cpp     |  11 +-
 gfx/skia/trunk/src/pathops/main.cpp                |  16 -
 gfx/skia/trunk/src/pdf/SkPDFDevice.cpp             |  44 +-
 gfx/skia/trunk/src/pdf/SkPDFFontImpl.h             |   0
 gfx/skia/trunk/src/pdf/SkPDFImage.cpp              |   2 +-
 gfx/skia/trunk/src/pipe/SkGPipePriv.h              |   1 +
 gfx/skia/trunk/src/pipe/SkGPipeRead.cpp            |  13 +-
 gfx/skia/trunk/src/pipe/SkGPipeWrite.cpp           | 151 ++--
 gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp   |  27 +
 gfx/skia/trunk/src/ports/SkFontHost_linux.cpp      |  14 +-
 gfx/skia/trunk/src/ports/SkFontHost_mac.cpp        |  26 +-
 .../trunk/src/ports/SkFontHost_sandbox_none.cpp    |   0
 gfx/skia/trunk/src/ports/SkFontHost_win.cpp        |  10 +
 gfx/skia/trunk/src/ports/SkFontHost_win_dw.cpp     |  10 +
 .../src/ports/SkGlobalInitialization_chromium.cpp  |   2 +
 .../src/ports/SkGlobalInitialization_default.cpp   |   2 +
 gfx/skia/trunk/src/ports/SkImageDecoder_CG.cpp     |   4 +-
 gfx/skia/trunk/src/ports/SkImageDecoder_WIC.cpp    |   6 +-
 gfx/skia/trunk/src/ports/SkThread_none.cpp         |  43 -
 gfx/skia/trunk/src/ports/SkThread_pthread.cpp      | 197 -----
 gfx/skia/trunk/src/ports/SkThread_win.cpp          |  65 --
 gfx/skia/trunk/src/sfnt/SkOTTableTypes.h           |  13 +
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V0.h        |  22 +-
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V1.h        | 224 ++---
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V2.h        | 252 +++---
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V3.h        | 268 +++---
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V4.h        | 346 ++++----
 gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_VA.h        |  20 +-
 gfx/skia/trunk/src/utils/SkBitSet.h                |   0
 gfx/skia/trunk/src/utils/SkBitmapHasher.cpp        |   2 +-
 gfx/skia/trunk/src/utils/SkCanvasStack.cpp         |  23 +-
 gfx/skia/trunk/src/utils/SkCanvasStack.h           |  13 +-
 gfx/skia/trunk/src/utils/SkCanvasStateUtils.cpp    |  34 +-
 gfx/skia/trunk/src/utils/SkDeferredCanvas.cpp      | 272 +++---
 gfx/skia/trunk/src/utils/SkDumpCanvas.cpp          |  84 +-
 .../trunk/src/utils/SkGatherPixelRefsAndRects.h    |  22 +-
 gfx/skia/trunk/src/utils/SkLua.cpp                 | 198 ++++-
 gfx/skia/trunk/src/utils/SkLuaCanvas.cpp           |  71 +-
 gfx/skia/trunk/src/utils/SkMD5.h                   |   4 +-
 gfx/skia/trunk/src/utils/SkNWayCanvas.cpp          |  72 +-
 gfx/skia/trunk/src/utils/SkNoSaveLayerCanvas.h     |  60 --
 gfx/skia/trunk/src/utils/SkPictureUtils.cpp        |  15 +-
 gfx/skia/trunk/src/utils/SkProxyCanvas.cpp         |  66 +-
 gfx/skia/trunk/src/utils/SkSHA1.h                  |   2 +
 gfx/skia/trunk/src/utils/SkThreadPool.cpp          | 127 ---
 .../trunk/src/utils/debugger/SkDebugCanvas.cpp     | 191 ++++-
 gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.h  |  82 +-
 .../trunk/src/utils/debugger/SkDrawCommand.cpp     |  72 ++
 gfx/skia/trunk/src/utils/debugger/SkDrawCommand.h  |  74 +-
 .../trunk/src/utils/debugger/SkObjectParser.cpp    |   4 +-
 .../trunk/src/utils/mac/SkCreateCGImageRef.cpp     |  23 +-
 gfx/skia/trunk/src/views/SkWidgets.cpp             |   8 +-
 gfx/skia/trunk/src/views/SkWindow.cpp              |  22 +-
 gfx/skia/trunk/src/views/mac/SkNSView.mm           |   2 +-
 374 files changed, 11716 insertions(+), 10902 deletions(-)
 delete mode 100644 gfx/skia/trunk/include/core/Sk64.h
 delete mode 100644 gfx/skia/trunk/include/core/SkImageFilterUtils.h
 delete mode 100644 gfx/skia/trunk/include/core/SkScalarCompare.h
 delete mode 100644 gfx/skia/trunk/include/core/SkThread_platform.h
 delete mode 100644 gfx/skia/trunk/include/effects/SkBitmapAlphaThresholdShader.h
 delete mode 100644 gfx/skia/trunk/include/gpu/GrBitmapTextContext.h
 delete mode 100644 gfx/skia/trunk/include/gpu/GrDistanceFieldTextContext.h
 delete mode 100644 gfx/skia/trunk/include/gpu/GrTextContext.h
 create mode 100644 gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h
 delete mode 100644 gfx/skia/trunk/src/core/Sk64.cpp
 delete mode 100644 gfx/skia/trunk/src/core/SkCordic.cpp
 delete mode 100644 gfx/skia/trunk/src/core/SkCordic.h
 create mode 100755 gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp
 create mode 100644 gfx/skia/trunk/src/core/SkDistanceFieldGen.h
 delete mode 100644 gfx/skia/trunk/src/core/SkFP.h
 delete mode 100644 gfx/skia/trunk/src/core/SkFlattenableBuffers.cpp
 delete mode 100644 gfx/skia/trunk/src/core/SkImageFilterUtils.cpp
 create mode 100644 gfx/skia/trunk/src/core/SkOffsetTable.h
 delete mode 100644 gfx/skia/trunk/src/core/SkOrderedReadBuffer.cpp
 delete mode 100644 gfx/skia/trunk/src/core/SkOrderedWriteBuffer.cpp
 delete mode 100644 gfx/skia/trunk/src/core/SkOrderedWriteBuffer.h
 create mode 100644 gfx/skia/trunk/src/core/SkSmallAllocator.h
 create mode 100644 gfx/skia/trunk/src/core/SkTInternalSList.h
 create mode 100644 gfx/skia/trunk/src/core/SkTObjectPool.h
 mode change 100755 => 100644 gfx/skia/trunk/src/core/SkTRefArray.h
 delete mode 100644 gfx/skia/trunk/src/core/SkTemplatesPriv.h
 delete mode 100644 gfx/skia/trunk/src/effects/SkBitmapAlphaThresholdShader.cpp
 mode change 100755 => 100644 gfx/skia/trunk/src/gpu/GrAllocator.h
 create mode 100644 gfx/skia/trunk/src/gpu/GrOrderedSet.h
 mode change 100755 => 100644 gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.h
 create mode 100644 gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp
 create mode 100644 gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h
 delete mode 100644 gfx/skia/trunk/src/gpu/effects/GrTextureDomainEffect.cpp
 delete mode 100644 gfx/skia/trunk/src/gpu/effects/GrTextureDomainEffect.h
 delete mode 100644 gfx/skia/trunk/src/image/SkDataPixelRef.cpp
 delete mode 100644 gfx/skia/trunk/src/image/SkDataPixelRef.h
 delete mode 100644 gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_clamp_neon.h
 delete mode 100644 gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_repeat_neon.h
 create mode 100644 gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h
 delete mode 100644 gfx/skia/trunk/src/pathops/main.cpp
 mode change 100755 => 100644 gfx/skia/trunk/src/pdf/SkPDFFontImpl.h
 delete mode 100644 gfx/skia/trunk/src/ports/SkFontHost_sandbox_none.cpp
 delete mode 100644 gfx/skia/trunk/src/ports/SkThread_none.cpp
 delete mode 100644 gfx/skia/trunk/src/ports/SkThread_pthread.cpp
 delete mode 100644 gfx/skia/trunk/src/ports/SkThread_win.cpp
 mode change 100755 => 100644 gfx/skia/trunk/src/utils/SkBitSet.h
 delete mode 100644 gfx/skia/trunk/src/utils/SkNoSaveLayerCanvas.h
 delete mode 100644 gfx/skia/trunk/src/utils/SkThreadPool.cpp
[PATCH 2/5] Update DrawTargetSkia and SkiaGLGlue to work with the new

From 2be7a1b190634801166756e8554d55a74816dc3c Mon Sep 17 00:00:00 2001
 Skia APIs
---
 gfx/2d/DrawTargetSkia.cpp                    |  10 +-
 gfx/2d/HelpersSkia.h                         |  25 ++-
 gfx/2d/Scale.cpp                             |   2 +-
 gfx/2d/SourceSurfaceSkia.cpp                 |   4 +-
 gfx/gl/SkiaGLGlue.cpp                        | 272 ++++++++++++---------------
 gfx/skia/trunk/include/config/SkUserConfig.h |   3 +
 6 files changed, 154 insertions(+), 162 deletions(-)
[PATCH 3/5] Sub out CreateTypeface* for Mac

From 36693fb99851dd763df7505c2de6119e75349bdd Mon Sep 17 00:00:00 2001
---
 gfx/skia/trunk/src/ports/SkFontHost_mac.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
[PATCH 4/5] GetTotalClip

From 497e1e966a5e8b2a661ca0360e5479ef8100327d Mon Sep 17 00:00:00 2001
---
 gfx/skia/trunk/include/config/SkUserConfig.h | 1 +
 1 file changed, 1 insertion(+)
[PATCH 5/5] Ensure that our GLContext is current and working at

From ef7bd639722d06ef3726d63079d24b7c93d85f1b Mon Sep 17 00:00:00 2001
 GrGLInterface creation time as Skia now determines extensions at creation
 time
---
 gfx/gl/SkiaGLGlue.cpp | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)