[PATCH 1/9] Bug 910754 - Update Skia to r11050

From ae53752d0f991ff4fa1e1f048c16f394c2076179 Mon Sep 17 00:00:00 2001
---
 gfx/skia/Makefile.in                               |    3 +
 gfx/skia/README_MOZILLA                            |    2 +-
 gfx/skia/include/config/SkUserConfig.h             |   39 +-
 gfx/skia/include/core/SkAdvancedTypefaceMetrics.h  |   11 +-
 gfx/skia/include/core/SkBitmap.h                   |   92 +-
 gfx/skia/include/core/SkBitmapDevice.h             |  295 ++
 gfx/skia/include/core/SkBlitRow.h                  |    1 -
 gfx/skia/include/core/SkCanvas.h                   |  127 +-
 gfx/skia/include/core/SkChecksum.h                 |   45 +
 gfx/skia/include/core/SkChunkAlloc.h               |    2 +
 gfx/skia/include/core/SkClipStack.h                |    5 +
 gfx/skia/include/core/SkColor.h                    |    3 +
 gfx/skia/include/core/SkColorFilter.h              |    2 +
 gfx/skia/include/core/SkColorPriv.h                |   58 +-
 gfx/skia/include/core/SkData.h                     |   61 +-
 gfx/skia/include/core/SkDataTable.h                |  184 ++
 gfx/skia/include/core/SkDeque.h                    |    2 +-
 gfx/skia/include/core/SkDevice.h                   |  172 +-
 gfx/skia/include/core/SkDeviceProperties.h         |    4 +-
 gfx/skia/include/core/SkDocument.h                 |   98 +
 gfx/skia/include/core/SkDraw.h                     |   16 +-
 gfx/skia/include/core/SkDrawFilter.h               |    1 +
 gfx/skia/include/core/SkEndian.h                   |   46 +-
 gfx/skia/include/core/SkError.h                    |   86 +
 gfx/skia/include/core/SkFixed.h                    |    7 +-
 gfx/skia/include/core/SkFlattenableBuffers.h       |    2 +-
 gfx/skia/include/core/SkFlattenableSerialization.h |   19 +
 gfx/skia/include/core/SkFloatingPoint.h            |    2 +
 gfx/skia/include/core/SkFontHost.h                 |    2 +
 gfx/skia/include/core/SkGeometry.h                 |   98 +
 gfx/skia/include/core/SkGraphics.h                 |    4 +
 gfx/skia/include/core/SkImage.h                    |   39 +-
 gfx/skia/include/core/SkImageDecoder.h             |  560 ++++
 gfx/skia/include/core/SkImageEncoder.h             |  100 +
 gfx/skia/include/core/SkImageFilter.h              |   71 +-
 gfx/skia/include/core/SkImageFilterUtils.h         |   38 +
 gfx/skia/include/core/SkMask.h                     |   13 +
 gfx/skia/include/core/SkMaskFilter.h               |   64 +-
 gfx/skia/include/core/SkMath.h                     |   37 +-
 gfx/skia/include/core/SkMatrix.h                   |   31 +
 gfx/skia/include/core/SkOSFile.h                   |   53 +-
 gfx/skia/include/core/SkPaint.h                    |  143 +-
 gfx/skia/include/core/SkPaintOptionsAndroid.h      |  129 +
 gfx/skia/include/core/SkPath.h                     |   99 +-
 gfx/skia/include/core/SkPathMeasure.h              |    4 +-
 gfx/skia/include/core/SkPicture.h                  |   87 +-
 gfx/skia/include/core/SkPixelRef.h                 |    5 +-
 gfx/skia/include/core/SkPostConfig.h               |   44 +-
 gfx/skia/include/core/SkPreConfig.h                |   10 -
 gfx/skia/include/core/SkRRect.h                    |    9 +-
 gfx/skia/include/core/SkRect.h                     |   16 +-
 gfx/skia/include/core/SkRefCnt.h                   |   35 +-
 gfx/skia/include/core/SkRegion.h                   |   10 +
 gfx/skia/include/core/SkScalar.h                   |   38 -
 gfx/skia/include/core/SkShader.h                   |    1 +
 gfx/skia/include/core/SkStream.h                   |  352 ++-
 gfx/skia/include/core/SkString.h                   |   15 +-
 gfx/skia/include/core/SkSurface.h                  |   24 +-
 gfx/skia/include/core/SkTArray.h                   |  101 +-
 gfx/skia/include/core/SkTDArray.h                  |    5 +-
 gfx/skia/include/core/SkTSearch.h                  |  173 +-
 gfx/skia/include/core/SkTemplates.h                |  181 +-
 gfx/skia/include/core/SkThread_platform.h          |    3 -
 gfx/skia/include/core/SkTypeface.h                 |  102 +-
 gfx/skia/include/core/SkTypes.h                    |  110 +-
 gfx/skia/include/core/SkWriter32.h                 |   21 +-
 gfx/skia/include/core/SkXfermode.h                 |   28 +-
 gfx/skia/include/device/xps/SkConstexprMath.h      |    6 +-
 gfx/skia/include/device/xps/SkXPSDevice.h          |   23 +-
 gfx/skia/include/effects/SkArithmeticMode.h        |    2 +
 gfx/skia/include/effects/SkAvoidXfermode.h         |    2 -
 gfx/skia/include/effects/SkBicubicImageFilter.h    |    6 +-
 gfx/skia/include/effects/SkBlurDrawLooper.h        |    6 +
 gfx/skia/include/effects/SkBlurImageFilter.h       |    8 +-
 gfx/skia/include/effects/SkBlurMaskFilter.h        |   24 +-
 .../include/effects/SkColorFilterImageFilter.h     |    8 +-
 gfx/skia/include/effects/SkColorMatrixFilter.h     |    2 +
 gfx/skia/include/effects/SkComposeImageFilter.h    |   31 +
 gfx/skia/include/effects/SkDisplacementMapEffect.h |    8 +-
 gfx/skia/include/effects/SkDropShadowImageFilter.h |   26 +
 gfx/skia/include/effects/SkEmbossMaskFilter.h      |    5 +-
 gfx/skia/include/effects/SkGradientShader.h        |   50 +-
 gfx/skia/include/effects/SkLayerDrawLooper.h       |   10 +-
 gfx/skia/include/effects/SkLerpXfermode.h          |   46 +
 gfx/skia/include/effects/SkLightingImageFilter.h   |   17 +-
 gfx/skia/include/effects/SkLumaXfermode.h          |   58 +
 gfx/skia/include/effects/SkMagnifierImageFilter.h  |    4 +-
 .../effects/SkMatrixConvolutionImageFilter.h       |    2 +-
 gfx/skia/include/effects/SkMorphologyImageFilter.h |    6 +-
 gfx/skia/include/effects/SkPerlinNoiseShader.h     |  111 +
 gfx/skia/include/effects/SkTestImageFilters.h      |   20 -
 gfx/skia/include/effects/SkXfermodeImageFilter.h   |   51 +
 gfx/skia/include/gpu/GrAARectRenderer.h            |   65 +-
 gfx/skia/include/gpu/GrBackendEffectFactory.h      |    2 +-
 gfx/skia/include/gpu/GrClipData.h                  |    7 +-
 gfx/skia/include/gpu/GrColor.h                     |   27 +-
 gfx/skia/include/gpu/GrConfig.h                    |   77 +-
 gfx/skia/include/gpu/GrContext.h                   |  161 +-
 gfx/skia/include/gpu/GrDrawEffect.h                |    4 +-
 gfx/skia/include/gpu/GrEffect.h                    |   83 +-
 gfx/skia/include/gpu/GrEffectStage.h               |  182 +-
 gfx/skia/include/gpu/GrFontScaler.h                |    5 +-
 gfx/skia/include/gpu/GrGlyph.h                     |    5 +-
 gfx/skia/include/gpu/GrNoncopyable.h               |    4 +-
 gfx/skia/include/gpu/GrOvalRenderer.h              |   31 +-
 gfx/skia/include/gpu/GrPaint.h                     |  172 +-
 gfx/skia/include/gpu/GrRect.h                      |   10 +-
 gfx/skia/include/gpu/GrRenderTarget.h              |   28 +-
 gfx/skia/include/gpu/GrResource.h                  |    6 +-
 gfx/skia/include/gpu/GrSurface.h                   |   25 +-
 gfx/skia/include/gpu/GrTBackendEffectFactory.h     |   12 +-
 gfx/skia/include/gpu/GrTextContext.h               |    5 +-
 gfx/skia/include/gpu/GrTexture.h                   |   41 +-
 gfx/skia/include/gpu/GrTextureAccess.h             |   48 +-
 gfx/skia/include/gpu/GrTypes.h                     |   79 +-
 gfx/skia/include/gpu/GrTypesPriv.h                 |   12 +-
 gfx/skia/include/gpu/GrUserConfig.h                |   24 -
 gfx/skia/include/gpu/SkGpuDevice.h                 |   44 +-
 gfx/skia/include/gpu/SkGr.h                        |   15 +-
 gfx/skia/include/gpu/SkGrPixelRef.h                |    2 +-
 gfx/skia/include/gpu/gl/GrGLConfig.h               |   16 +-
 gfx/skia/include/gpu/gl/GrGLExtensions.h           |    4 +-
 gfx/skia/include/gpu/gl/GrGLFunctions.h            |   10 +
 gfx/skia/include/gpu/gl/GrGLInterface.h            |   19 +-
 gfx/skia/include/gpu/gl/SkGLContextHelper.h        |    2 +-
 gfx/skia/include/images/SkForceLinking.h           |   20 +
 gfx/skia/include/images/SkImageDecoder.h           |  476 ---
 gfx/skia/include/lazy/SkBitmapFactory.h            |    4 +
 gfx/skia/include/lazy/SkImageCache.h               |   17 +-
 gfx/skia/include/lazy/SkLruImageCache.h            |   14 +-
 gfx/skia/include/lazy/SkPurgeableImageCache.h      |   18 +-
 gfx/skia/include/pathops/SkPathOps.h               |   57 +
 gfx/skia/include/pdf/SkPDFDevice.h                 |   78 +-
 gfx/skia/include/pdf/SkPDFDocument.h               |    7 +-
 gfx/skia/include/pipe/SkGPipe.h                    |   15 +-
 gfx/skia/include/ports/SkFontConfigInterface.h     |   25 +
 gfx/skia/include/ports/SkFontMgr.h                 |   20 +-
 gfx/skia/include/ports/SkFontStyle.h               |    3 +-
 gfx/skia/include/ports/SkTypeface_android.h        |   84 +-
 gfx/skia/include/ports/SkTypeface_win.h            |    9 +-
 gfx/skia/include/utils/SkCanvasStateUtils.h        |   76 +
 gfx/skia/include/utils/SkDeferredCanvas.h          |   41 +-
 gfx/skia/include/utils/SkDumpCanvas.h              |   12 +-
 gfx/skia/include/utils/SkLua.h                     |   63 +
 gfx/skia/include/utils/SkLuaCanvas.h               |   84 +
 gfx/skia/include/utils/SkNWayCanvas.h              |    9 +-
 gfx/skia/include/utils/SkPathUtils.h               |   40 +
 gfx/skia/include/utils/SkProxyCanvas.h             |    9 +-
 gfx/skia/include/utils/SkRTConf.h                  |   14 +-
 gfx/skia/include/utils/SkThreadPool.h              |    3 +-
 gfx/skia/include/utils/win/SkTScopedComPtr.h       |   16 +-
 gfx/skia/include/views/SkOSWindow_Unix.h           |   13 +-
 gfx/skia/include/views/SkView.h                    |    6 +
 gfx/skia/moz.build                                 |   83 +-
 gfx/skia/src/animator/SkAnimatorScript.cpp         |    2 +-
 gfx/skia/src/animator/SkDisplayEvent.cpp           |   74 -
 gfx/skia/src/animator/SkDrawEmboss.cpp             |   17 +-
 gfx/skia/src/animator/SkDrawEmboss.h               |   10 +-
 gfx/skia/src/animator/SkScript.cpp                 |   12 +-
 gfx/skia/src/animator/SkScriptRuntime.cpp          |    4 +-
 gfx/skia/src/animator/SkScriptTokenizer.cpp        |    2 +-
 gfx/skia/src/animator/SkSnapshot.cpp               |    4 +
 gfx/skia/src/core/Sk64.cpp                         |    6 -
 gfx/skia/src/core/SkAAClip.cpp                     |    1 +
 gfx/skia/src/core/SkAdvancedTypefaceMetrics.cpp    |   17 +-
 gfx/skia/src/core/SkBBoxHierarchyRecord.cpp        |    2 +-
 gfx/skia/src/core/SkBBoxHierarchyRecord.h          |    2 +-
 gfx/skia/src/core/SkBBoxRecord.cpp                 |   65 +-
 gfx/skia/src/core/SkBBoxRecord.h                   |    5 +-
 gfx/skia/src/core/SkBitmap.cpp                     |  209 +-
 gfx/skia/src/core/SkBitmapDevice.cpp               |  409 +++
 gfx/skia/src/core/SkBitmapFilter.cpp               |  148 +
 gfx/skia/src/core/SkBitmapFilter.h                 |  175 ++
 gfx/skia/src/core/SkBitmapHeap.cpp                 |   41 +-
 gfx/skia/src/core/SkBitmapHeap.h                   |    4 +-
 gfx/skia/src/core/SkBitmapProcShader.cpp           |   32 +-
 gfx/skia/src/core/SkBitmapProcState.cpp            |  657 +++--
 gfx/skia/src/core/SkBitmapProcState.h              |   53 +-
 gfx/skia/src/core/SkBitmapProcState_matrix.h       |   12 +-
 .../src/core/SkBitmapProcState_matrixProcs.cpp     |   38 +-
 gfx/skia/src/core/SkBitmapProcState_sample.h       |    8 +-
 gfx/skia/src/core/SkBitmapProcState_shaderproc.h   |    4 +-
 gfx/skia/src/core/SkBitmapScaler.cpp               |  318 ++
 gfx/skia/src/core/SkBitmapScaler.h                 |  108 +
 gfx/skia/src/core/SkBlitBWMaskTemplate.h           |    2 -
 gfx/skia/src/core/SkBlitMask_D32.cpp               |    6 +-
 gfx/skia/src/core/SkBlitRow_D16.cpp                |    8 -
 gfx/skia/src/core/SkBlitRow_D4444.cpp              |  218 --
 gfx/skia/src/core/SkBlitter.cpp                    |    4 -
 gfx/skia/src/core/SkBlitter_4444.cpp               |  480 ----
 gfx/skia/src/core/SkBlitter_A8.cpp                 |    4 +
 gfx/skia/src/core/SkBlitter_RGB16.cpp              |  102 +-
 gfx/skia/src/core/SkCanvas.cpp                     |  294 +-
 gfx/skia/src/core/SkChunkAlloc.cpp                 |    4 +
 gfx/skia/src/core/SkClipStack.cpp                  |  100 +-
 gfx/skia/src/core/SkColorFilter.cpp                |   90 +-
 gfx/skia/src/core/SkConfig8888.cpp                 |   22 +-
 gfx/skia/src/core/SkConvolver.cpp                  |  461 +++
 gfx/skia/src/core/SkConvolver.h                    |  203 ++
 gfx/skia/src/core/SkCordic.cpp                     |   12 +-
 gfx/skia/src/core/SkCoreBlitters.h                 |    6 +-
 gfx/skia/src/core/SkData.cpp                       |   57 +-
 gfx/skia/src/core/SkDataTable.cpp                  |  250 ++
 gfx/skia/src/core/SkDebug.cpp                      |   18 +-
 gfx/skia/src/core/SkDevice.cpp                     |  472 +--
 gfx/skia/src/core/SkDeviceImageFilterProxy.h       |    6 +-
 gfx/skia/src/core/SkDeviceLooper.cpp               |  114 +
 gfx/skia/src/core/SkDeviceLooper.h                 |   96 +
 gfx/skia/src/core/SkDeviceProfile.cpp              |    3 +-
 gfx/skia/src/core/SkDiscardableMemory.h            |   54 +
 gfx/skia/src/core/SkDraw.cpp                       |  197 +-
 gfx/skia/src/core/SkDrawLooper.cpp                 |   58 +
 gfx/skia/src/core/SkDrawProcs.h                    |   19 +-
 gfx/skia/src/core/SkEdgeBuilder.cpp                |   50 +-
 gfx/skia/src/core/SkEdgeBuilder.h                  |    1 +
 gfx/skia/src/core/SkEdgeClipper.cpp                |   16 +-
 gfx/skia/src/core/SkError.cpp                      |  143 +
 gfx/skia/src/core/SkErrorInternals.h               |   27 +
 gfx/skia/src/core/SkFilterShader.cpp               |  102 +
 gfx/skia/src/core/SkFlattenableSerialization.cpp   |   28 +
 gfx/skia/src/core/SkFontHost.cpp                   |   80 +-
 gfx/skia/src/core/SkGeometry.cpp                   |  320 ++-
 gfx/skia/src/core/SkGlyphCache.cpp                 |   65 +-
 gfx/skia/src/core/SkGlyphCache.h                   |   23 +-
 gfx/skia/src/core/SkImageFilter.cpp                |  103 +-
 gfx/skia/src/core/SkImageFilterUtils.cpp           |   46 +
 gfx/skia/src/core/SkMaskFilter.cpp                 |  107 +-
 gfx/skia/src/core/SkMath.cpp                       |   19 -
 gfx/skia/src/core/SkMathPriv.h                     |    8 -
 gfx/skia/src/core/SkMatrix.cpp                     |  170 +-
 gfx/skia/src/core/SkMatrixUtils.h                  |   11 +
 gfx/skia/src/core/SkMipMap.cpp                     |  262 ++
 gfx/skia/src/core/SkMipMap.h                       |   43 +
 gfx/skia/src/core/SkOrderedReadBuffer.cpp          |  108 +-
 gfx/skia/src/core/SkOrderedReadBuffer.h            |   12 +-
 gfx/skia/src/core/SkOrderedWriteBuffer.cpp         |   87 +-
 gfx/skia/src/core/SkOrderedWriteBuffer.h           |   18 +-
 gfx/skia/src/core/SkPaint.cpp                      |  320 ++-
 gfx/skia/src/core/SkPaintOptionsAndroid.cpp        |   44 +
 gfx/skia/src/core/SkPath.cpp                       |  414 +--
 gfx/skia/src/core/SkPathMeasure.cpp                |    6 +-
 gfx/skia/src/core/SkPathRef.h                      |  211 +-
 gfx/skia/src/core/SkPicture.cpp                    |   73 +-
 gfx/skia/src/core/SkPictureFlat.cpp                |   25 +-
 gfx/skia/src/core/SkPictureFlat.h                  |  530 ++--
 gfx/skia/src/core/SkPicturePlayback.cpp            |   75 +-
 gfx/skia/src/core/SkPicturePlayback.h              |    6 +-
 gfx/skia/src/core/SkPictureRecord.cpp              |  160 +-
 gfx/skia/src/core/SkPictureRecord.h                |   31 +-
 gfx/skia/src/core/SkPixelRef.cpp                   |   48 +-
 gfx/skia/src/core/SkPoint.cpp                      |   72 +-
 gfx/skia/src/core/SkPtrRecorder.cpp                |    8 +-
 gfx/skia/src/core/SkPtrRecorder.h                  |    2 +-
 gfx/skia/src/core/SkRRect.cpp                      |   35 +-
 gfx/skia/src/core/SkRTree.cpp                      |   40 +-
 gfx/skia/src/core/SkRTree.h                        |    6 +-
 gfx/skia/src/core/SkRasterClip.cpp                 |   14 -
 gfx/skia/src/core/SkRasterClip.h                   |    1 -
 gfx/skia/src/core/SkRegion.cpp                     |    9 +
 gfx/skia/src/core/SkRegion_path.cpp                |   17 +-
 gfx/skia/src/core/SkScaledImageCache.cpp           |  525 ++++
 gfx/skia/src/core/SkScaledImageCache.h             |  119 +
 gfx/skia/src/core/SkScalerContext.cpp              |  209 +-
 gfx/skia/src/core/SkScalerContext.h                |   26 +-
 gfx/skia/src/core/SkScan_Hairline.cpp              |   93 +-
 gfx/skia/src/core/SkStream.cpp                     |  469 ++-
 gfx/skia/src/core/SkString.cpp                     |  110 +-
 gfx/skia/src/core/SkStroke.cpp                     |  102 +-
 gfx/skia/src/core/SkStroke.cpp.orig                |  766 +++++
 gfx/skia/src/core/SkStrokeRec.cpp                  |    2 +-
 gfx/skia/src/core/SkTDynamicHash.h                 |  241 ++
 gfx/skia/src/core/SkTRefArray.h                    |    2 +-
 gfx/skia/src/core/SkTSort.h                        |   10 -
 gfx/skia/src/core/SkTileGrid.cpp                   |   18 +-
 gfx/skia/src/core/SkTileGrid.h                     |   12 +-
 gfx/skia/src/core/SkTypeface.cpp                   |  141 +-
 gfx/skia/src/core/SkTypefaceCache.cpp              |   19 +-
 gfx/skia/src/core/SkTypefaceCache.h                |   36 +-
 gfx/skia/src/core/SkUtilsArm.cpp                   |    2 +-
 gfx/skia/src/core/SkWriter32.cpp                   |    5 +-
 gfx/skia/src/core/SkXfermode.cpp                   |  537 +++-
 gfx/skia/src/device/xps/SkXPSDevice.cpp            |  144 +-
 gfx/skia/src/doc/SkDocument.cpp                    |   84 +
 gfx/skia/src/doc/SkDocument_PDF.cpp                |   91 +
 gfx/skia/src/effects/SkArithmeticMode.cpp          |  327 ++-
 gfx/skia/src/effects/SkAvoidXfermode.cpp           |   53 -
 gfx/skia/src/effects/SkBicubicImageFilter.cpp      |   46 +-
 gfx/skia/src/effects/SkBlendImageFilter.cpp        |  321 ---
 gfx/skia/src/effects/SkBlurDrawLooper.cpp          |   25 +-
 gfx/skia/src/effects/SkBlurImageFilter.cpp         |   93 +-
 gfx/skia/src/effects/SkBlurMask.cpp                |  688 +----
 gfx/skia/src/effects/SkBlurMask.h                  |   38 +-
 gfx/skia/src/effects/SkBlurMaskFilter.cpp          |  225 +-
 gfx/skia/src/effects/SkColorFilterImageFilter.cpp  |   39 +-
 gfx/skia/src/effects/SkColorFilters.cpp            |   55 +
 gfx/skia/src/effects/SkColorMatrixFilter.cpp       |   25 +-
 gfx/skia/src/effects/SkComposeImageFilter.cpp      |   56 +
 gfx/skia/src/effects/SkCornerPathEffect.cpp        |    3 +
 gfx/skia/src/effects/SkDashPathEffect.cpp          |    7 +
 gfx/skia/src/effects/SkDisplacementMapEffect.cpp   |   49 +-
 gfx/skia/src/effects/SkDropShadowImageFilter.cpp   |   62 +
 gfx/skia/src/effects/SkEmbossMaskFilter.cpp        |   46 +-
 gfx/skia/src/effects/SkGpuBlurUtils.cpp            |  265 ++
 gfx/skia/src/effects/SkGpuBlurUtils.h              |   46 +
 gfx/skia/src/effects/SkLayerDrawLooper.cpp         |   43 +-
 gfx/skia/src/effects/SkLerpXfermode.cpp            |  110 +
 gfx/skia/src/effects/SkLightingImageFilter.cpp     |  417 +--
 gfx/skia/src/effects/SkLumaXfermode.cpp            |  222 ++
 gfx/skia/src/effects/SkMagnifierImageFilter.cpp    |   49 +-
 .../src/effects/SkMatrixConvolutionImageFilter.cpp |   59 +-
 gfx/skia/src/effects/SkMergeImageFilter.cpp        |    2 +-
 gfx/skia/src/effects/SkMorphologyImageFilter.cpp   |   46 +-
 gfx/skia/src/effects/SkOffsetImageFilter.cpp       |    6 +-
 gfx/skia/src/effects/SkPerlinNoiseShader.cpp       | 1378 +++++++++
 gfx/skia/src/effects/SkRectShaderImageFilter.cpp   |   23 +-
 gfx/skia/src/effects/SkTableColorFilter.cpp        |   30 +-
 gfx/skia/src/effects/SkTestImageFilters.cpp        |   56 +-
 gfx/skia/src/effects/SkTransparentShader.cpp       |   16 -
 gfx/skia/src/effects/SkXfermodeImageFilter.cpp     |  146 +
 .../src/effects/gradients/SkGradientShader.cpp     |  302 +-
 .../src/effects/gradients/SkGradientShaderPriv.h   |   59 +-
 .../src/effects/gradients/SkLinearGradient.cpp     |   45 +-
 gfx/skia/src/effects/gradients/SkLinearGradient.h  |    4 +-
 .../src/effects/gradients/SkRadialGradient.cpp     |    7 +-
 gfx/skia/src/effects/gradients/SkRadialGradient.h  |    4 +-
 gfx/skia/src/effects/gradients/SkSweepGradient.cpp |   15 +-
 gfx/skia/src/effects/gradients/SkSweepGradient.h   |    3 +-
 .../gradients/SkTwoPointConicalGradient.cpp        |   57 +-
 .../effects/gradients/SkTwoPointConicalGradient.h  |    4 +-
 .../effects/gradients/SkTwoPointRadialGradient.cpp |   53 +-
 .../effects/gradients/SkTwoPointRadialGradient.h   |    4 +-
 gfx/skia/src/fonts/SkFontMgr_fontconfig.cpp        |  296 ++
 gfx/skia/src/fonts/SkGScalerContext.cpp            |  267 ++
 gfx/skia/src/fonts/SkGScalerContext.h              |   47 +
 gfx/skia/src/gpu/GrAAConvexPathRenderer.cpp        |  446 +--
 gfx/skia/src/gpu/GrAAHairLinePathRenderer.cpp      |  911 +++---
 gfx/skia/src/gpu/GrAAHairLinePathRenderer.h        |   27 +-
 gfx/skia/src/gpu/GrAARectRenderer.cpp              |  643 ++++-
 gfx/skia/src/gpu/GrAllocPool.cpp                   |   11 +-
 gfx/skia/src/gpu/GrAllocPool.h                     |    2 +-
 gfx/skia/src/gpu/GrAllocator.h                     |   14 +-
 gfx/skia/src/gpu/GrAtlas.cpp                       |   78 +-
 gfx/skia/src/gpu/GrAtlas.h                         |   35 +-
 gfx/skia/src/gpu/GrBinHashKey.h                    |   18 +-
 gfx/skia/src/gpu/GrBlend.cpp                       |  154 +
 gfx/skia/src/gpu/GrBlend.h                         |   45 +
 gfx/skia/src/gpu/GrBufferAllocPool.cpp             |   70 +-
 gfx/skia/src/gpu/GrBufferAllocPool.h               |    2 +-
 gfx/skia/src/gpu/GrClipData.cpp                    |    8 +-
 gfx/skia/src/gpu/GrClipMaskCache.h                 |   24 +-
 gfx/skia/src/gpu/GrClipMaskManager.cpp             |  123 +-
 gfx/skia/src/gpu/GrClipMaskManager.h               |   11 +-
 gfx/skia/src/gpu/GrContext.cpp                     |  881 +++---
 gfx/skia/src/gpu/GrDefaultPathRenderer.cpp         |   59 +-
 gfx/skia/src/gpu/GrDefaultPathRenderer.h           |    2 +-
 gfx/skia/src/gpu/GrDrawState.cpp                   |  315 +-
 gfx/skia/src/gpu/GrDrawState.h                     |  578 ++--
 gfx/skia/src/gpu/GrDrawTarget.cpp                  |  380 ++-
 gfx/skia/src/gpu/GrDrawTarget.h                    |  199 +-
 gfx/skia/src/gpu/GrDrawTargetCaps.h                |    6 +-
 gfx/skia/src/gpu/GrEffect.cpp                      |    6 +-
 gfx/skia/src/gpu/GrGpu.cpp                         |  114 +-
 gfx/skia/src/gpu/GrGpu.h                           |   63 +-
 gfx/skia/src/gpu/GrGpuFactory.cpp                  |    2 +-
 gfx/skia/src/gpu/GrInOrderDrawBuffer.cpp           |  218 +-
 gfx/skia/src/gpu/GrInOrderDrawBuffer.h             |   54 +-
 gfx/skia/src/gpu/GrMemoryPool.cpp                  |   48 +-
 gfx/skia/src/gpu/GrMemoryPool.h                    |    6 +-
 gfx/skia/src/gpu/GrOvalRenderer.cpp                |  694 +++--
 gfx/skia/src/gpu/GrPaint.cpp                       |  129 +
 gfx/skia/src/gpu/GrPath.h                          |    7 +-
 gfx/skia/src/gpu/GrPathRenderer.cpp                |   12 +
 gfx/skia/src/gpu/GrPathRenderer.h                  |   29 +-
 gfx/skia/src/gpu/GrPathRendererChain.cpp           |    2 +-
 gfx/skia/src/gpu/GrPathUtils.cpp                   |  395 ++-
 gfx/skia/src/gpu/GrPathUtils.h                     |   61 +-
 gfx/skia/src/gpu/GrPlotMgr.h                       |    8 +-
 gfx/skia/src/gpu/GrRectanizer.cpp                  |   14 +-
 gfx/skia/src/gpu/GrRectanizer.h                    |    9 +-
 gfx/skia/src/gpu/GrRectanizer_fifo.cpp             |   14 +-
 gfx/skia/src/gpu/GrRedBlackTree.h                  |  217 +-
 gfx/skia/src/gpu/GrRenderTarget.cpp                |   27 +-
 gfx/skia/src/gpu/GrResource.cpp                    |    4 +-
 gfx/skia/src/gpu/GrResourceCache.cpp               |  186 +-
 gfx/skia/src/gpu/GrResourceCache.h                 |   85 +-
 gfx/skia/src/gpu/GrSWMaskHelper.cpp                |   53 +-
 gfx/skia/src/gpu/GrSWMaskHelper.h                  |   11 +-
 gfx/skia/src/gpu/GrSoftwarePathRenderer.cpp        |   30 +-
 gfx/skia/src/gpu/GrStencil.h                       |    2 +-
 gfx/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp |   20 +-
 gfx/skia/src/gpu/GrStencilBuffer.cpp               |    2 +-
 gfx/skia/src/gpu/GrTBSearch.h                      |    2 +-
 gfx/skia/src/gpu/GrTHashCache.h                    |   16 +-
 gfx/skia/src/gpu/GrTest.cpp                        |   37 +
 gfx/skia/src/gpu/GrTest.h                          |   35 +
 gfx/skia/src/gpu/GrTextContext.cpp                 |   90 +-
 gfx/skia/src/gpu/GrTextStrike.cpp                  |  112 +-
 gfx/skia/src/gpu/GrTextStrike.h                    |   11 +-
 gfx/skia/src/gpu/GrTextStrike_impl.h               |    8 +-
 gfx/skia/src/gpu/GrTexture.cpp                     |   65 +-
 gfx/skia/src/gpu/GrTextureAccess.cpp               |   30 +-
 gfx/skia/src/gpu/SkGpuDevice.cpp                   |  859 +++---
 gfx/skia/src/gpu/SkGr.cpp                          |   25 +-
 gfx/skia/src/gpu/SkGrFontScaler.cpp                |    8 +-
 gfx/skia/src/gpu/SkGrPixelRef.cpp                  |    4 +-
 gfx/skia/src/gpu/effects/GrBezierEffect.cpp        |  426 +++
 gfx/skia/src/gpu/effects/GrBezierEffect.h          |  253 ++
 .../src/gpu/effects/GrConfigConversionEffect.cpp   |   42 +-
 gfx/skia/src/gpu/effects/GrConvolutionEffect.cpp   |   90 +-
 gfx/skia/src/gpu/effects/GrConvolutionEffect.h     |   33 +-
 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.cpp |   30 +-
 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.h   |   20 +-
 gfx/skia/src/gpu/effects/GrSingleTextureEffect.cpp |    4 +-
 gfx/skia/src/gpu/effects/GrSingleTextureEffect.h   |    3 +-
 gfx/skia/src/gpu/effects/GrTextureDomainEffect.cpp |   61 +-
 gfx/skia/src/gpu/effects/GrTextureDomainEffect.h   |    8 +-
 gfx/skia/src/gpu/effects/GrTextureStripAtlas.cpp   |   59 +-
 gfx/skia/src/gpu/effects/GrTextureStripAtlas.h     |    4 +-
 gfx/skia/src/gpu/gl/GrGLBufferImpl.cpp             |   23 +-
 gfx/skia/src/gpu/gl/GrGLBufferImpl.h               |    2 +-
 gfx/skia/src/gpu/gl/GrGLCaps.cpp                   |  236 +-
 gfx/skia/src/gpu/gl/GrGLCaps.h                     |   69 +-
 gfx/skia/src/gpu/gl/GrGLContext.cpp                |    5 +
 gfx/skia/src/gpu/gl/GrGLContext.h                  |    7 +-
 gfx/skia/src/gpu/gl/GrGLCreateNullInterface.cpp    |  211 +-
 gfx/skia/src/gpu/gl/GrGLDefines.h                  |    3 +
 gfx/skia/src/gpu/gl/GrGLEffect.cpp                 |    6 +-
 gfx/skia/src/gpu/gl/GrGLEffectMatrix.cpp           |   62 +-
 gfx/skia/src/gpu/gl/GrGLEffectMatrix.h             |   15 +-
 gfx/skia/src/gpu/gl/GrGLExtensions.cpp             |   37 +-
 gfx/skia/src/gpu/gl/GrGLIRect.h                    |   10 +-
 gfx/skia/src/gpu/gl/GrGLIndexBuffer.h              |    2 +-
 gfx/skia/src/gpu/gl/GrGLInterface.cpp              |   57 +-
 gfx/skia/src/gpu/gl/GrGLNoOpInterface.cpp          |   45 +
 gfx/skia/src/gpu/gl/GrGLNoOpInterface.h            |   31 +
 gfx/skia/src/gpu/gl/GrGLPath.cpp                   |   25 +-
 gfx/skia/src/gpu/gl/GrGLProgram.cpp                |  796 ++---
 gfx/skia/src/gpu/gl/GrGLProgram.h                  |  102 +-
 gfx/skia/src/gpu/gl/GrGLProgramDesc.cpp            |  270 +-
 gfx/skia/src/gpu/gl/GrGLProgramDesc.h              |  194 +-
 gfx/skia/src/gpu/gl/GrGLRenderTarget.cpp           |   22 +-
 gfx/skia/src/gpu/gl/GrGLRenderTarget.h             |    3 +-
 gfx/skia/src/gpu/gl/GrGLSL.cpp                     |  141 +-
 gfx/skia/src/gpu/gl/GrGLSL.h                       |  133 +-
 gfx/skia/src/gpu/gl/GrGLSL_impl.h                  |  192 ++
 gfx/skia/src/gpu/gl/GrGLShaderBuilder.cpp          |  637 ++--
 gfx/skia/src/gpu/gl/GrGLShaderBuilder.h            |  385 ++-
 gfx/skia/src/gpu/gl/GrGLShaderVar.h                |  100 +-
 gfx/skia/src/gpu/gl/GrGLTexture.cpp                |   23 +-
 gfx/skia/src/gpu/gl/GrGLTexture.h                  |   13 +-
 gfx/skia/src/gpu/gl/GrGLUniformHandle.h            |    5 +-
 gfx/skia/src/gpu/gl/GrGLUniformManager.cpp         |  125 +-
 gfx/skia/src/gpu/gl/GrGLUniformManager.h           |   30 +-
 gfx/skia/src/gpu/gl/GrGLUtil.cpp                   |   64 +-
 gfx/skia/src/gpu/gl/GrGLUtil.h                     |    2 +
 gfx/skia/src/gpu/gl/GrGLVertexArray.cpp            |    2 +-
 gfx/skia/src/gpu/gl/GrGLVertexArray.h              |    2 +-
 gfx/skia/src/gpu/gl/GrGLVertexBuffer.h             |    2 +-
 gfx/skia/src/gpu/gl/GrGpuGL.cpp                    |  848 ++++--
 gfx/skia/src/gpu/gl/GrGpuGL.h                      |   87 +-
 gfx/skia/src/gpu/gl/GrGpuGL_program.cpp            |  208 +-
 gfx/skia/src/gpu/gl/SkGLContextHelper.cpp          |    8 +-
 .../android/GrGLCreateNativeInterface_android.cpp  |   62 +-
 .../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp  |  208 +-
 gfx/skia/src/gpu/gl/debug/GrBufferObj.cpp          |    2 +-
 gfx/skia/src/gpu/gl/debug/GrBufferObj.h            |   18 +-
 gfx/skia/src/gpu/gl/debug/GrDebugGL.cpp            |    2 +-
 gfx/skia/src/gpu/gl/debug/GrDebugGL.h              |    4 +-
 gfx/skia/src/gpu/gl/debug/GrFrameBufferObj.cpp     |    2 +-
 .../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp  |   31 +-
 gfx/skia/src/gpu/gl/debug/GrTextureUnitObj.h       |    3 +-
 .../gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp   |    7 +-
 .../gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp   |   12 +
 .../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp    |   12 +
 .../gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp |   66 +
 .../gpu/gl/win/GrGLCreateNativeInterface_win.cpp   |    9 +
 gfx/skia/src/gpu/gr_unittests.cpp                  |   18 +-
 gfx/skia/src/image/SkImage.cpp                     |   29 +-
 gfx/skia/src/image/SkImagePriv.cpp                 |   32 +-
 gfx/skia/src/image/SkImagePriv.h                   |    8 +-
 gfx/skia/src/image/SkImage_Base.h                  |    7 +
 gfx/skia/src/image/SkImage_Codec.cpp               |   14 +-
 gfx/skia/src/image/SkImage_Gpu.cpp                 |   49 +-
 gfx/skia/src/image/SkImage_Picture.cpp             |   12 +
 gfx/skia/src/image/SkImage_Raster.cpp              |   12 +-
 gfx/skia/src/image/SkSurface.cpp                   |   46 +-
 gfx/skia/src/image/SkSurface_Base.h                |   31 +-
 gfx/skia/src/image/SkSurface_Gpu.cpp               |   54 +-
 gfx/skia/src/image/SkSurface_Picture.cpp           |    8 +-
 gfx/skia/src/image/SkSurface_Raster.cpp            |   23 +-
 gfx/skia/src/images/SkForceLinking.cpp             |   33 +
 gfx/skia/src/images/SkImageDecoder.cpp             |  285 +-
 .../src/images/SkImageDecoder_FactoryDefault.cpp   |   37 +
 .../src/images/SkImageDecoder_FactoryRegistrar.cpp |   69 +
 gfx/skia/src/images/SkImageDecoder_libbmp.cpp      |   49 +-
 gfx/skia/src/images/SkImageDecoder_libgif.cpp      |   35 +-
 gfx/skia/src/images/SkImageDecoder_libico.cpp      |   62 +-
 gfx/skia/src/images/SkImageDecoder_libjpeg.cpp     |  505 ++--
 gfx/skia/src/images/SkImageDecoder_libpng.cpp      |  267 +-
 gfx/skia/src/images/SkImageDecoder_libwebp.cpp     |  138 +-
 gfx/skia/src/images/SkImageDecoder_wbmp.cpp        |   22 +-
 gfx/skia/src/images/SkImageEncoder.cpp             |   18 +-
 gfx/skia/src/images/SkImageEncoder_argb.cpp        |  119 +
 gfx/skia/src/images/SkImageRef.cpp                 |   18 +-
 gfx/skia/src/images/SkImageRef_ashmem.cpp          |    9 +-
 gfx/skia/src/images/SkJpegUtility.cpp              |   53 +-
 gfx/skia/src/images/SkJpegUtility.h                |   10 +-
 gfx/skia/src/images/SkMovie_gif.cpp                |   10 +-
 gfx/skia/src/images/SkScaledBitmapSampler.cpp      |  123 +-
 gfx/skia/src/images/SkScaledBitmapSampler.h        |    2 +-
 gfx/skia/src/images/SkStreamHelpers.cpp            |   40 +
 gfx/skia/src/images/SkStreamHelpers.h              |   27 +
 gfx/skia/src/lazy/SkBitmapFactory.cpp              |    2 +
 gfx/skia/src/lazy/SkLruImageCache.cpp              |    3 +
 gfx/skia/src/lazy/SkPurgeableImageCache.cpp        |    1 +
 gfx/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp     |  636 ++++
 gfx/skia/src/opts/SkBitmapFilter_opts_SSE2.h       |   37 +
 gfx/skia/src/opts/SkBitmapProcState_filter_neon.h  |    4 +-
 .../src/opts/SkBitmapProcState_matrix_clamp_neon.h |   28 +-
 .../opts/SkBitmapProcState_matrix_repeat_neon.h    |   16 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp  |   19 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp |    5 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp   |  210 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_none.cpp  |    3 +
 gfx/skia/src/opts/SkBlitMask_opts_arm.cpp          |   18 +
 gfx/skia/src/opts/SkBlitMask_opts_none.cpp         |   18 +
 gfx/skia/src/opts/SkBlitRow_opts_SSE2.cpp          |  217 +-
 gfx/skia/src/opts/SkBlitRow_opts_arm.cpp           |   70 +-
 gfx/skia/src/opts/SkBlitRow_opts_arm_neon.cpp      |  319 ++-
 gfx/skia/src/opts/SkBlitRow_opts_arm_neon.h        |   18 +
 gfx/skia/src/opts/SkBlitRow_opts_none.cpp          |   21 +-
 gfx/skia/src/opts/SkUtils_opts_SSE2.cpp            |   18 +-
 gfx/skia/src/opts/SkUtils_opts_none.cpp            |    5 -
 gfx/skia/src/opts/opts_check_SSE2.cpp              |   31 +-
 gfx/skia/src/pathops/SkAddIntersections.cpp        |  430 +++
 gfx/skia/src/pathops/SkAddIntersections.h          |   18 +
 gfx/skia/src/pathops/SkDCubicIntersection.cpp      |  548 ++++
 gfx/skia/src/pathops/SkDCubicLineIntersection.cpp  |  327 +++
 gfx/skia/src/pathops/SkDCubicToQuads.cpp           |  190 ++
 gfx/skia/src/pathops/SkDLineIntersection.cpp       |  315 ++
 gfx/skia/src/pathops/SkDQuadImplicit.cpp           |  117 +
 gfx/skia/src/pathops/SkDQuadImplicit.h             |   39 +
 gfx/skia/src/pathops/SkDQuadIntersection.cpp       |  551 ++++
 gfx/skia/src/pathops/SkDQuadLineIntersection.cpp   |  402 +++
 gfx/skia/src/pathops/SkIntersectionHelper.h        |  135 +
 gfx/skia/src/pathops/SkIntersections.cpp           |  189 ++
 gfx/skia/src/pathops/SkIntersections.h             |  261 ++
 gfx/skia/src/pathops/SkLineParameters.h            |  119 +
 gfx/skia/src/pathops/SkOpAngle.cpp                 |  430 +++
 gfx/skia/src/pathops/SkOpAngle.h                   |   93 +
 gfx/skia/src/pathops/SkOpContour.cpp               |  261 ++
 gfx/skia/src/pathops/SkOpContour.h                 |  255 ++
 gfx/skia/src/pathops/SkOpEdgeBuilder.cpp           |  196 ++
 gfx/skia/src/pathops/SkOpEdgeBuilder.h             |   63 +
 gfx/skia/src/pathops/SkOpSegment.cpp               | 3027 ++++++++++++++++++++
 gfx/skia/src/pathops/SkOpSegment.h                 |  415 +++
 gfx/skia/src/pathops/SkOpSpan.h                    |   31 +
 gfx/skia/src/pathops/SkPathOpsBounds.cpp           |   40 +
 gfx/skia/src/pathops/SkPathOpsBounds.h             |   63 +
 gfx/skia/src/pathops/SkPathOpsCommon.cpp           |  594 ++++
 gfx/skia/src/pathops/SkPathOpsCommon.h             |   32 +
 gfx/skia/src/pathops/SkPathOpsCubic.cpp            |  510 ++++
 gfx/skia/src/pathops/SkPathOpsCubic.h              |   82 +
 gfx/skia/src/pathops/SkPathOpsCurve.h              |  152 +
 gfx/skia/src/pathops/SkPathOpsDebug.cpp            |   88 +
 gfx/skia/src/pathops/SkPathOpsDebug.h              |  160 ++
 gfx/skia/src/pathops/SkPathOpsLine.cpp             |  144 +
 gfx/skia/src/pathops/SkPathOpsLine.h               |   42 +
 gfx/skia/src/pathops/SkPathOpsOp.cpp               |  319 +++
 gfx/skia/src/pathops/SkPathOpsPoint.cpp            |   17 +
 gfx/skia/src/pathops/SkPathOpsPoint.h              |  164 ++
 gfx/skia/src/pathops/SkPathOpsQuad.cpp             |  342 +++
 gfx/skia/src/pathops/SkPathOpsQuad.h               |   68 +
 gfx/skia/src/pathops/SkPathOpsRect.cpp             |   65 +
 gfx/skia/src/pathops/SkPathOpsRect.h               |   63 +
 gfx/skia/src/pathops/SkPathOpsSimplify.cpp         |  206 ++
 gfx/skia/src/pathops/SkPathOpsSpan.h               |   31 +
 gfx/skia/src/pathops/SkPathOpsTriangle.cpp         |   31 +
 gfx/skia/src/pathops/SkPathOpsTriangle.h           |   20 +
 gfx/skia/src/pathops/SkPathOpsTypes.cpp            |  104 +
 gfx/skia/src/pathops/SkPathOpsTypes.h              |  277 ++
 gfx/skia/src/pathops/SkPathWriter.cpp              |  166 ++
 gfx/skia/src/pathops/SkPathWriter.h                |   45 +
 gfx/skia/src/pathops/SkQuarticRoot.cpp             |  165 ++
 gfx/skia/src/pathops/SkQuarticRoot.h               |   16 +
 gfx/skia/src/pathops/SkReduceOrder.cpp             |  452 +++
 gfx/skia/src/pathops/SkReduceOrder.h               |   38 +
 gfx/skia/src/pathops/main.cpp                      |   16 +
 gfx/skia/src/pdf/SkPDFDevice.cpp                   |  381 ++-
 gfx/skia/src/pdf/SkPDFDocument.cpp                 |   11 +-
 gfx/skia/src/pdf/SkPDFFont.cpp                     |    2 +-
 gfx/skia/src/pdf/SkPDFFormXObject.cpp              |   40 +-
 gfx/skia/src/pdf/SkPDFFormXObject.h                |   12 +
 gfx/skia/src/pdf/SkPDFGraphicState.cpp             |    8 +-
 gfx/skia/src/pdf/SkPDFGraphicState.h               |   13 +-
 gfx/skia/src/pdf/SkPDFImage.cpp                    |  597 ++--
 gfx/skia/src/pdf/SkPDFImage.h                      |   42 +-
 gfx/skia/src/pdf/SkPDFPage.cpp                     |    8 +-
 gfx/skia/src/pdf/SkPDFResourceDict.cpp             |  126 +
 gfx/skia/src/pdf/SkPDFResourceDict.h               |  100 +
 gfx/skia/src/pdf/SkPDFShader.cpp                   |  449 ++-
 gfx/skia/src/pdf/SkPDFShader.h                     |    5 +
 gfx/skia/src/pdf/SkPDFStream.cpp                   |   29 +-
 gfx/skia/src/pdf/SkPDFStream.h                     |   44 +-
 gfx/skia/src/pdf/SkPDFUtils.cpp                    |   38 +-
 gfx/skia/src/pdf/SkPDFUtils.h                      |    4 +-
 gfx/skia/src/pdf/SkTSet.h                          |  276 +-
 gfx/skia/src/pipe/SkGPipePriv.h                    |    3 +
 gfx/skia/src/pipe/SkGPipeRead.cpp                  |   26 +-
 gfx/skia/src/pipe/SkGPipeWrite.cpp                 |   30 +-
 gfx/skia/src/pipe/utils/SamplePipeControllers.cpp  |   11 +-
 gfx/skia/src/pipe/utils/SamplePipeControllers.h    |    6 +-
 gfx/skia/src/ports/SkDiscardableMemory_none.cpp    |   12 +
 .../src/ports/SkFontConfigInterface_android.cpp    |  825 ++++++
 .../src/ports/SkFontConfigInterface_direct.cpp     |  361 ++-
 gfx/skia/src/ports/SkFontConfigParser_android.cpp  |  318 ++
 gfx/skia/src/ports/SkFontConfigParser_android.h    |   61 +
 gfx/skia/src/ports/SkFontConfigTypeface.h          |   64 +
 gfx/skia/src/ports/SkFontHost_FreeType.cpp         |  263 +-
 gfx/skia/src/ports/SkFontHost_FreeType_common.h    |   16 +-
 gfx/skia/src/ports/SkFontHost_cairo.cpp            |   38 +-
 gfx/skia/src/ports/SkFontHost_fontconfig.cpp       |  134 +-
 gfx/skia/src/ports/SkFontHost_linux.cpp            |   35 +-
 gfx/skia/src/ports/SkFontHost_mac.cpp              |  591 ++--
 gfx/skia/src/ports/SkFontHost_win.cpp              | 1239 ++++++--
 gfx/skia/src/ports/SkFontHost_win_dw.cpp           |  904 ++++--
 gfx/skia/src/ports/SkFontMgr_default_dw.cpp        |    6 +
 gfx/skia/src/ports/SkFontMgr_default_gdi.cpp       |    6 +
 .../src/ports/SkGlobalInitialization_chromium.cpp  |    2 +
 .../src/ports/SkGlobalInitialization_default.cpp   |   15 +-
 gfx/skia/src/ports/SkImageDecoder_CG.cpp           |  120 +-
 gfx/skia/src/ports/SkImageDecoder_WIC.cpp          |  130 +-
 gfx/skia/src/ports/SkImageDecoder_empty.cpp        |  103 +-
 gfx/skia/src/ports/SkOSFile_none.cpp               |   26 +
 gfx/skia/src/ports/SkOSFile_posix.cpp              |   80 +
 gfx/skia/src/ports/SkOSFile_stdio.cpp              |   81 +-
 gfx/skia/src/ports/SkOSFile_win.cpp                |  113 +
 gfx/skia/src/ports/SkTLS_none.cpp                  |   18 +
 gfx/skia/src/ports/SkTLS_pthread.cpp               |   30 +
 gfx/skia/src/ports/SkTLS_win.cpp                   |   75 +
 gfx/skia/src/ports/SkThread_none.cpp               |   15 -
 gfx/skia/src/ports/SkThread_pthread.cpp            |   23 -
 gfx/skia/src/ports/SkThread_win.cpp                |   71 -
 gfx/skia/src/sfnt/SkOTTable_name.cpp               |   48 +-
 gfx/skia/src/sfnt/SkOTTable_name.h                 |    8 +-
 gfx/skia/src/sfnt/SkOTUtils.cpp                    |   42 +
 gfx/skia/src/sfnt/SkOTUtils.h                      |   52 +
 gfx/skia/src/sfnt/SkTTCFHeader.h                   |   56 +
 gfx/skia/src/utils/SkBitmapHasher.cpp              |   64 +
 gfx/skia/src/utils/SkBitmapHasher.h                |   35 +
 gfx/skia/src/utils/SkCanvasStateUtils.cpp          |  340 +++
 gfx/skia/src/utils/SkDeferredCanvas.cpp            |  240 +-
 gfx/skia/src/utils/SkDumpCanvas.cpp                |   22 +-
 gfx/skia/src/utils/SkJSON.cpp                      |    4 +-
 gfx/skia/src/utils/SkLayer.cpp                     |    2 +-
 gfx/skia/src/utils/SkLua.cpp                       | 1129 ++++++++
 gfx/skia/src/utils/SkLuaCanvas.cpp                 |  289 ++
 gfx/skia/src/utils/SkMD5.h                         |    2 +-
 gfx/skia/src/utils/SkMatrix44.cpp                  |  142 +-
 gfx/skia/src/utils/SkNWayCanvas.cpp                |   26 +-
 gfx/skia/src/utils/SkOSFile.cpp                    |   26 +-
 gfx/skia/src/utils/SkPDFRasterizer.cpp             |   73 +
 gfx/skia/src/utils/SkPDFRasterizer.h               |   15 +
 gfx/skia/src/utils/SkParsePath.cpp                 |    5 +-
 gfx/skia/src/utils/SkPathUtils.cpp                 |  152 +
 gfx/skia/src/utils/SkPictureUtils.cpp              |   27 +-
 gfx/skia/src/utils/SkProxyCanvas.cpp               |   17 +-
 gfx/skia/src/utils/SkRTConf.cpp                    |   39 +-
 gfx/skia/src/utils/SkSHA1.h                        |    2 +-
 gfx/skia/src/utils/SkTFitsIn.h                     |  209 ++
 gfx/skia/src/utils/SkTLogic.h                      |   61 +
 gfx/skia/src/utils/SkThreadPool.cpp                |   23 +-
 gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp |   19 -
 gfx/skia/src/utils/SkThreadUtils_win.cpp           |    2 +-
 gfx/skia/src/utils/debugger/SkDebugCanvas.cpp      |  423 +++
 gfx/skia/src/utils/debugger/SkDebugCanvas.h        |  274 ++
 gfx/skia/src/utils/debugger/SkDrawCommand.cpp      |  882 ++++++
 gfx/skia/src/utils/debugger/SkDrawCommand.h        |  558 ++++
 gfx/skia/src/utils/debugger/SkObjectParser.cpp     |  370 +++
 gfx/skia/src/utils/debugger/SkObjectParser.h       |  128 +
 gfx/skia/src/utils/ios/SkFontHost_iOS.mm           |   10 +-
 gfx/skia/src/utils/ios/SkOSFile_iOS.mm             |    4 +-
 gfx/skia/src/utils/mac/SkCreateCGImageRef.cpp      |   12 +-
 gfx/skia/src/utils/win/SkDWriteFontFileStream.cpp  |  142 +-
 gfx/skia/src/utils/win/SkDWriteFontFileStream.h    |   11 +-
 gfx/skia/src/utils/win/SkDWriteGeometrySink.cpp    |    6 +-
 gfx/skia/src/utils/win/SkHRESULT.cpp               |    2 +-
 gfx/skia/src/utils/win/SkIStream.cpp               |    2 +-
 gfx/skia/src/utils/win/SkWGL_win.cpp               |   45 +-
 gfx/skia/src/views/SkTextBox.cpp                   |    2 +-
 gfx/skia/src/views/SkView.cpp                      |  119 +-
 gfx/skia/src/views/mac/SampleApp-Info.plist        |    2 +
 gfx/skia/src/views/mac/SkNSView.mm                 |   78 +-
 gfx/skia/src/views/mac/SkOptionsTableView.mm       |   24 +-
 gfx/skia/src/views/mac/SkTextFieldCell.m           |    4 +-
 gfx/skia/src/views/unix/SkOSWindow_Unix.cpp        |  213 +-
 gfx/skia/src/views/unix/skia_unix.cpp              |   25 -
 gfx/skia/src/xml/SkJS.cpp                          |   26 +-
 gfx/skia/src/xml/SkJSDisplayable.cpp               |   30 +-
 699 files changed, 57665 insertions(+), 16520 deletions(-)
 create mode 100644 gfx/skia/include/core/SkBitmapDevice.h
 create mode 100644 gfx/skia/include/core/SkDataTable.h
 create mode 100644 gfx/skia/include/core/SkDocument.h
 create mode 100644 gfx/skia/include/core/SkError.h
 create mode 100644 gfx/skia/include/core/SkFlattenableSerialization.h
 create mode 100644 gfx/skia/include/core/SkImageDecoder.h
 create mode 100644 gfx/skia/include/core/SkImageEncoder.h
 create mode 100644 gfx/skia/include/core/SkImageFilterUtils.h
 create mode 100644 gfx/skia/include/core/SkPaintOptionsAndroid.h
 create mode 100644 gfx/skia/include/effects/SkComposeImageFilter.h
 create mode 100644 gfx/skia/include/effects/SkDropShadowImageFilter.h
 create mode 100644 gfx/skia/include/effects/SkLerpXfermode.h
 create mode 100644 gfx/skia/include/effects/SkLumaXfermode.h
 create mode 100644 gfx/skia/include/effects/SkPerlinNoiseShader.h
 create mode 100644 gfx/skia/include/effects/SkXfermodeImageFilter.h
 create mode 100644 gfx/skia/include/images/SkForceLinking.h
 delete mode 100644 gfx/skia/include/images/SkImageDecoder.h
 create mode 100644 gfx/skia/include/pathops/SkPathOps.h
 create mode 100644 gfx/skia/include/utils/SkCanvasStateUtils.h
 create mode 100644 gfx/skia/include/utils/SkLua.h
 create mode 100644 gfx/skia/include/utils/SkLuaCanvas.h
 create mode 100644 gfx/skia/include/utils/SkPathUtils.h
 create mode 100644 gfx/skia/src/core/SkBitmapDevice.cpp
 create mode 100644 gfx/skia/src/core/SkBitmapFilter.cpp
 create mode 100644 gfx/skia/src/core/SkBitmapFilter.h
 create mode 100644 gfx/skia/src/core/SkBitmapScaler.cpp
 create mode 100644 gfx/skia/src/core/SkBitmapScaler.h
 delete mode 100644 gfx/skia/src/core/SkBlitRow_D4444.cpp
 delete mode 100644 gfx/skia/src/core/SkBlitter_4444.cpp
 create mode 100644 gfx/skia/src/core/SkConvolver.cpp
 create mode 100644 gfx/skia/src/core/SkConvolver.h
 create mode 100644 gfx/skia/src/core/SkDataTable.cpp
 create mode 100644 gfx/skia/src/core/SkDeviceLooper.cpp
 create mode 100644 gfx/skia/src/core/SkDeviceLooper.h
 create mode 100644 gfx/skia/src/core/SkDiscardableMemory.h
 create mode 100644 gfx/skia/src/core/SkDrawLooper.cpp
 create mode 100644 gfx/skia/src/core/SkError.cpp
 create mode 100644 gfx/skia/src/core/SkErrorInternals.h
 create mode 100644 gfx/skia/src/core/SkFilterShader.cpp
 create mode 100644 gfx/skia/src/core/SkFlattenableSerialization.cpp
 create mode 100644 gfx/skia/src/core/SkImageFilterUtils.cpp
 create mode 100644 gfx/skia/src/core/SkMipMap.cpp
 create mode 100644 gfx/skia/src/core/SkMipMap.h
 create mode 100644 gfx/skia/src/core/SkPaintOptionsAndroid.cpp
 create mode 100644 gfx/skia/src/core/SkScaledImageCache.cpp
 create mode 100644 gfx/skia/src/core/SkScaledImageCache.h
 create mode 100644 gfx/skia/src/core/SkStroke.cpp.orig
 create mode 100644 gfx/skia/src/core/SkTDynamicHash.h
 create mode 100644 gfx/skia/src/doc/SkDocument.cpp
 create mode 100644 gfx/skia/src/doc/SkDocument_PDF.cpp
 delete mode 100644 gfx/skia/src/effects/SkBlendImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkComposeImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkDropShadowImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkGpuBlurUtils.cpp
 create mode 100644 gfx/skia/src/effects/SkGpuBlurUtils.h
 create mode 100644 gfx/skia/src/effects/SkLerpXfermode.cpp
 create mode 100644 gfx/skia/src/effects/SkLumaXfermode.cpp
 create mode 100644 gfx/skia/src/effects/SkPerlinNoiseShader.cpp
 create mode 100644 gfx/skia/src/effects/SkXfermodeImageFilter.cpp
 create mode 100644 gfx/skia/src/fonts/SkFontMgr_fontconfig.cpp
 create mode 100644 gfx/skia/src/fonts/SkGScalerContext.cpp
 create mode 100644 gfx/skia/src/fonts/SkGScalerContext.h
 create mode 100644 gfx/skia/src/gpu/GrBlend.cpp
 create mode 100644 gfx/skia/src/gpu/GrBlend.h
 create mode 100644 gfx/skia/src/gpu/GrPaint.cpp
 create mode 100644 gfx/skia/src/gpu/GrTest.cpp
 create mode 100644 gfx/skia/src/gpu/GrTest.h
 create mode 100644 gfx/skia/src/gpu/effects/GrBezierEffect.cpp
 create mode 100644 gfx/skia/src/gpu/effects/GrBezierEffect.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLSL_impl.h
 create mode 100644 gfx/skia/src/images/SkForceLinking.cpp
 create mode 100644 gfx/skia/src/images/SkImageDecoder_FactoryDefault.cpp
 create mode 100644 gfx/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
 create mode 100644 gfx/skia/src/images/SkImageEncoder_argb.cpp
 create mode 100644 gfx/skia/src/images/SkStreamHelpers.cpp
 create mode 100644 gfx/skia/src/images/SkStreamHelpers.h
 create mode 100644 gfx/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
 create mode 100644 gfx/skia/src/opts/SkBitmapFilter_opts_SSE2.h
 create mode 100644 gfx/skia/src/opts/SkBlitMask_opts_arm.cpp
 create mode 100644 gfx/skia/src/opts/SkBlitMask_opts_none.cpp
 create mode 100644 gfx/skia/src/opts/SkBlitRow_opts_arm_neon.h
 create mode 100644 gfx/skia/src/pathops/SkAddIntersections.cpp
 create mode 100644 gfx/skia/src/pathops/SkAddIntersections.h
 create mode 100644 gfx/skia/src/pathops/SkDCubicIntersection.cpp
 create mode 100644 gfx/skia/src/pathops/SkDCubicLineIntersection.cpp
 create mode 100644 gfx/skia/src/pathops/SkDCubicToQuads.cpp
 create mode 100644 gfx/skia/src/pathops/SkDLineIntersection.cpp
 create mode 100644 gfx/skia/src/pathops/SkDQuadImplicit.cpp
 create mode 100644 gfx/skia/src/pathops/SkDQuadImplicit.h
 create mode 100644 gfx/skia/src/pathops/SkDQuadIntersection.cpp
 create mode 100644 gfx/skia/src/pathops/SkDQuadLineIntersection.cpp
 create mode 100644 gfx/skia/src/pathops/SkIntersectionHelper.h
 create mode 100644 gfx/skia/src/pathops/SkIntersections.cpp
 create mode 100644 gfx/skia/src/pathops/SkIntersections.h
 create mode 100644 gfx/skia/src/pathops/SkLineParameters.h
 create mode 100644 gfx/skia/src/pathops/SkOpAngle.cpp
 create mode 100644 gfx/skia/src/pathops/SkOpAngle.h
 create mode 100644 gfx/skia/src/pathops/SkOpContour.cpp
 create mode 100644 gfx/skia/src/pathops/SkOpContour.h
 create mode 100644 gfx/skia/src/pathops/SkOpEdgeBuilder.cpp
 create mode 100644 gfx/skia/src/pathops/SkOpEdgeBuilder.h
 create mode 100644 gfx/skia/src/pathops/SkOpSegment.cpp
 create mode 100644 gfx/skia/src/pathops/SkOpSegment.h
 create mode 100644 gfx/skia/src/pathops/SkOpSpan.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsBounds.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsBounds.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsCommon.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsCommon.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsCubic.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsCubic.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsCurve.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsDebug.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsDebug.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsLine.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsLine.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsOp.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsPoint.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsPoint.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsQuad.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsQuad.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsRect.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsRect.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsSimplify.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsSpan.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsTriangle.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsTriangle.h
 create mode 100644 gfx/skia/src/pathops/SkPathOpsTypes.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathOpsTypes.h
 create mode 100644 gfx/skia/src/pathops/SkPathWriter.cpp
 create mode 100644 gfx/skia/src/pathops/SkPathWriter.h
 create mode 100644 gfx/skia/src/pathops/SkQuarticRoot.cpp
 create mode 100644 gfx/skia/src/pathops/SkQuarticRoot.h
 create mode 100644 gfx/skia/src/pathops/SkReduceOrder.cpp
 create mode 100644 gfx/skia/src/pathops/SkReduceOrder.h
 create mode 100644 gfx/skia/src/pathops/main.cpp
 create mode 100644 gfx/skia/src/pdf/SkPDFResourceDict.cpp
 create mode 100644 gfx/skia/src/pdf/SkPDFResourceDict.h
 create mode 100644 gfx/skia/src/ports/SkDiscardableMemory_none.cpp
 create mode 100644 gfx/skia/src/ports/SkFontConfigInterface_android.cpp
 create mode 100644 gfx/skia/src/ports/SkFontConfigParser_android.cpp
 create mode 100644 gfx/skia/src/ports/SkFontConfigParser_android.h
 create mode 100644 gfx/skia/src/ports/SkFontConfigTypeface.h
 create mode 100644 gfx/skia/src/ports/SkFontMgr_default_dw.cpp
 create mode 100644 gfx/skia/src/ports/SkFontMgr_default_gdi.cpp
 create mode 100644 gfx/skia/src/ports/SkOSFile_none.cpp
 create mode 100644 gfx/skia/src/ports/SkOSFile_posix.cpp
 create mode 100644 gfx/skia/src/ports/SkOSFile_win.cpp
 create mode 100644 gfx/skia/src/ports/SkTLS_none.cpp
 create mode 100644 gfx/skia/src/ports/SkTLS_pthread.cpp
 create mode 100644 gfx/skia/src/ports/SkTLS_win.cpp
 create mode 100644 gfx/skia/src/sfnt/SkTTCFHeader.h
 create mode 100644 gfx/skia/src/utils/SkBitmapHasher.cpp
 create mode 100644 gfx/skia/src/utils/SkBitmapHasher.h
 create mode 100644 gfx/skia/src/utils/SkCanvasStateUtils.cpp
 create mode 100644 gfx/skia/src/utils/SkLua.cpp
 create mode 100644 gfx/skia/src/utils/SkLuaCanvas.cpp
 create mode 100644 gfx/skia/src/utils/SkPDFRasterizer.cpp
 create mode 100644 gfx/skia/src/utils/SkPDFRasterizer.h
 create mode 100644 gfx/skia/src/utils/SkPathUtils.cpp
 create mode 100644 gfx/skia/src/utils/SkTFitsIn.h
 create mode 100644 gfx/skia/src/utils/SkTLogic.h
 create mode 100644 gfx/skia/src/utils/debugger/SkDebugCanvas.cpp
 create mode 100644 gfx/skia/src/utils/debugger/SkDebugCanvas.h
 create mode 100644 gfx/skia/src/utils/debugger/SkDrawCommand.cpp
 create mode 100644 gfx/skia/src/utils/debugger/SkDrawCommand.h
 create mode 100644 gfx/skia/src/utils/debugger/SkObjectParser.cpp
 create mode 100644 gfx/skia/src/utils/debugger/SkObjectParser.h
[PATCH 2/9] Bug 910754 - Update DrawTarget for new Skia

From d36304ad5d75827e9ffd88fe5df8f132d1485d7b Mon Sep 17 00:00:00 2001
---
 gfx/2d/DrawTargetSkia.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
[PATCH 3/9] Bug 910754 - getFileName() has been removed from

From cb6fb6f25bac9a74e42c048b79f43323689e055e Mon Sep 17 00:00:00 2001
 SkTypeface, so let's just refuse to provide a filename
---
 other-licenses/skia-npapi/ANPTypeface.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
[PATCH 4/9] Bug 848491 - Add the glCopyTexSubImage2D and

From e36fb75e15fba3b721ab56fddff7c87bcf6e0418 Mon Sep 17 00:00:00 2001
 glGenerateMipmap function pointers to our GrGLInterface
---
 gfx/gl/GLContextSkia.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)
[PATCH 5/9] Bug 910754 - Do not demote for advanced compositing ops

From afd176898144c844676df75e1daf34165572355f Mon Sep 17 00:00:00 2001
 as Skia now supports these
---
 content/canvas/src/CanvasRenderingContext2D.cpp | 30 -------------------------
 1 file changed, 30 deletions(-)
[PATCH 6/9] Bug 910754 - Mark linear-gradient-1a and

From d3811baeb447c0fbd19e8c20b3ff85d315647569 Mon Sep 17 00:00:00 2001
 linear-gradient-1b as fails-if with Skia
---
 layout/reftests/canvas/reftest.list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH 7/9] Bug 910754 - Add a bunch more required OpenGL functions

From 86cb0d95429e34ce170b7f47119ce1f4570256ca Mon Sep 17 00:00:00 2001
 for SkiaGL when using desktop OpenGL
---
 gfx/gl/GLContext.cpp      | 10 ++++++++
 gfx/gl/GLContext.h        | 60 ++++++++++++++++++++++++++++++++++++++++++++
 gfx/gl/GLContextSkia.cpp  | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 gfx/gl/GLContextSymbols.h | 23 +++++++++++++++++
 4 files changed, 156 insertions(+)
[PATCH 9/9] test skiagl

From b7f7d90f6eab974c0613e0a480ec3e39379a5b7a Mon Sep 17 00:00:00 2001
---
 content/canvas/src/CanvasRenderingContext2D.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)