[PATCH 01/13] Bug 848491 - Update Skia to r8495

From 831411cbcc6e01aba06a00a62a13dc600188bf84 Mon Sep 17 00:00:00 2001
---
 gfx/skia/Makefile.in                               |    5 +
 gfx/skia/README_MOZILLA                            |    2 +-
 gfx/skia/include/animator/SkAnimator.h             |    1 -
 gfx/skia/include/animator/SkAnimatorView.h         |    1 -
 gfx/skia/include/config/SkUserConfig.h             |   33 +-
 gfx/skia/include/core/Sk64.h                       |    1 -
 gfx/skia/include/core/SkAdvancedTypefaceMetrics.h  |    2 -
 gfx/skia/include/core/SkAnnotation.h               |   39 +
 gfx/skia/include/core/SkBitmap.h                   |   65 +-
 gfx/skia/include/core/SkBounder.h                  |    1 -
 gfx/skia/include/core/SkCanvas.h                   |  137 +-
 gfx/skia/include/core/SkChecksum.h                 |    6 +-
 gfx/skia/include/core/SkClipStack.h                |  312 ++-
 gfx/skia/include/core/SkColor.h                    |   27 +-
 gfx/skia/include/core/SkColorFilter.h              |   21 +-
 gfx/skia/include/core/SkColorPriv.h                |    1 -
 gfx/skia/include/core/SkColorShader.h              |    1 +
 gfx/skia/include/core/SkComposeShader.h            |   10 +-
 gfx/skia/include/core/SkData.h                     |    8 +-
 gfx/skia/include/core/SkDevice.h                   |   70 +-
 gfx/skia/include/core/SkDeviceProperties.h         |  112 +
 gfx/skia/include/core/SkDraw.h                     |   19 +-
 gfx/skia/include/core/SkDrawFilter.h               |   14 +-
 gfx/skia/include/core/SkDrawLooper.h               |    3 +
 gfx/skia/include/core/SkEmptyShader.h              |    1 +
 gfx/skia/include/core/SkEndian.h                   |    1 -
 gfx/skia/include/core/SkFixed.h                    |    2 +-
 gfx/skia/include/core/SkFlattenable.h              |   20 -
 gfx/skia/include/core/SkFlattenableBuffers.h       |    9 -
 gfx/skia/include/core/SkFloatBits.h                |    1 -
 gfx/skia/include/core/SkFloatingPoint.h            |    7 +
 gfx/skia/include/core/SkFontHost.h                 |  247 +--
 gfx/skia/include/core/SkFontLCDConfig.h            |   58 +
 gfx/skia/include/core/SkGraphics.h                 |    1 -
 gfx/skia/include/core/SkImage.h                    |   11 +-
 gfx/skia/include/core/SkImageFilter.h              |   74 +-
 gfx/skia/include/core/SkImageTypes.h               |   39 +
 gfx/skia/include/core/SkInstCnt.h                  |    7 +-
 gfx/skia/include/core/SkLineClipper.h              |    1 -
 gfx/skia/include/core/SkMMapStream.h               |   30 -
 gfx/skia/include/core/SkMask.h                     |    1 -
 gfx/skia/include/core/SkMaskFilter.h               |   45 +-
 gfx/skia/include/core/SkMath.h                     |    3 +-
 gfx/skia/include/core/SkMatrix.h                   |   24 +-
 gfx/skia/include/core/SkMetaData.h                 |    1 -
 gfx/skia/include/core/SkOSFile.h                   |   38 +-
 gfx/skia/include/core/SkPaint.h                    |   46 +-
 gfx/skia/include/core/SkPath.h                     |  279 ++-
 gfx/skia/include/core/SkPathEffect.h               |  144 +-
 gfx/skia/include/core/SkPicture.h                  |   84 +-
 gfx/skia/include/core/SkPixelRef.h                 |   56 +-
 gfx/skia/include/core/SkPoint.h                    |   16 +-
 gfx/skia/include/core/SkPostConfig.h               |  110 +-
 gfx/skia/include/core/SkPreConfig.h                |   68 +-
 gfx/skia/include/core/SkRRect.h                    |  288 +++
 gfx/skia/include/core/SkRandom.h                   |  122 --
 gfx/skia/include/core/SkRasterizer.h               |    6 +-
 gfx/skia/include/core/SkReader32.h                 |    6 +
 gfx/skia/include/core/SkRect.h                     |  105 +-
 gfx/skia/include/core/SkRefCnt.h                   |   14 +-
 gfx/skia/include/core/SkScalar.h                   |   31 +-
 gfx/skia/include/core/SkScalarCompare.h            |    1 -
 gfx/skia/include/core/SkShader.h                   |   66 +-
 gfx/skia/include/core/SkSize.h                     |    6 +-
 gfx/skia/include/core/SkStream.h                   |   36 +-
 gfx/skia/include/core/SkString.h                   |   70 +-
 gfx/skia/include/core/SkStringUtils.h              |   23 +
 gfx/skia/include/core/SkStrokeRec.h                |   92 +
 gfx/skia/include/core/SkSurface.h                  |   10 +-
 gfx/skia/include/core/SkTArray.h                   |   54 +-
 gfx/skia/include/core/SkTDArray.h                  |   29 +-
 gfx/skia/include/core/SkTDLinkedList.h             |  179 --
 gfx/skia/include/core/SkTDStack.h                  |    1 -
 gfx/skia/include/core/SkTDict.h                    |    9 +-
 gfx/skia/include/core/SkTInternalLList.h           |  272 +++
 gfx/skia/include/core/SkTLazy.h                    |   98 +-
 gfx/skia/include/core/SkTSearch.h                  |    1 -
 gfx/skia/include/core/SkTemplates.h                |   38 +-
 gfx/skia/include/core/SkThread_platform.h          |   17 +-
 gfx/skia/include/core/SkTileGridPicture.h          |   56 +
 gfx/skia/include/core/SkTime.h                     |    1 -
 gfx/skia/include/core/SkTrace.h                    |    2 -
 gfx/skia/include/core/SkTypeface.h                 |   56 +-
 gfx/skia/include/core/SkTypes.h                    |   42 +-
 gfx/skia/include/core/SkUnitMapper.h               |    1 -
 gfx/skia/include/core/SkUtils.h                    |   19 -
 gfx/skia/include/core/SkWriter32.h                 |  130 +-
 gfx/skia/include/core/SkXfermode.h                 |   82 +-
 gfx/skia/include/effects/Sk1DPathEffect.h          |   23 +-
 gfx/skia/include/effects/Sk2DPathEffect.h          |   28 +-
 gfx/skia/include/effects/SkArithmeticMode.h        |    6 +-
 gfx/skia/include/effects/SkAvoidXfermode.h         |   13 +-
 gfx/skia/include/effects/SkBicubicImageFilter.h    |   54 +
 gfx/skia/include/effects/SkBitmapSource.h          |    2 -
 gfx/skia/include/effects/SkBlendImageFilter.h      |    8 +-
 gfx/skia/include/effects/SkBlurDrawLooper.h        |    4 +-
 gfx/skia/include/effects/SkBlurImageFilter.h       |   10 +-
 gfx/skia/include/effects/SkBlurMaskFilter.h        |    3 -
 .../include/effects/SkColorFilterImageFilter.h     |   11 +-
 gfx/skia/include/effects/SkColorMatrix.h           |   10 +-
 gfx/skia/include/effects/SkColorMatrixFilter.h     |   18 +-
 gfx/skia/include/effects/SkCornerPathEffect.h      |    8 +-
 gfx/skia/include/effects/SkDashPathEffect.h        |   18 +-
 gfx/skia/include/effects/SkDiscretePathEffect.h    |    8 +-
 gfx/skia/include/effects/SkDisplacementMapEffect.h |   54 +
 gfx/skia/include/effects/SkDrawExtraPathEffect.h   |    6 +-
 gfx/skia/include/effects/SkEmbossMaskFilter.h      |   10 +-
 gfx/skia/include/effects/SkGradientShader.h        |    1 -
 gfx/skia/include/effects/SkImageFilterUtils.h      |   36 +
 gfx/skia/include/effects/SkKernel33MaskFilter.h    |   19 +-
 gfx/skia/include/effects/SkLayerDrawLooper.h       |    6 +-
 gfx/skia/include/effects/SkLayerRasterizer.h       |    4 +-
 gfx/skia/include/effects/SkLightingImageFilter.h   |   18 +-
 gfx/skia/include/effects/SkMagnifierImageFilter.h  |    3 +-
 .../effects/SkMatrixConvolutionImageFilter.h       |   86 +
 gfx/skia/include/effects/SkMergeImageFilter.h      |   46 +
 gfx/skia/include/effects/SkMorphologyImageFilter.h |   11 +-
 gfx/skia/include/effects/SkOffsetImageFilter.h     |   33 +
 gfx/skia/include/effects/SkPaintFlagsDrawFilter.h  |    8 +-
 gfx/skia/include/effects/SkPixelXorXfermode.h      |    7 +-
 gfx/skia/include/effects/SkPorterDuff.h            |    7 +-
 gfx/skia/include/effects/SkRectShaderImageFilter.h |   43 +
 .../include/effects/SkSingleInputImageFilter.h     |   44 -
 gfx/skia/include/effects/SkStippleMaskFilter.h     |    9 +-
 gfx/skia/include/effects/SkTableMaskFilter.h       |   14 +-
 gfx/skia/include/effects/SkTestImageFilters.h      |   75 +-
 gfx/skia/include/effects/SkTransparentShader.h     |   12 +-
 gfx/skia/include/gpu/GrAARectRenderer.h            |    4 -
 gfx/skia/include/gpu/GrBackendEffectFactory.h      |   86 +
 gfx/skia/include/gpu/GrCacheID.h                   |   99 -
 gfx/skia/include/gpu/GrClipData.h                  |    1 -
 gfx/skia/include/gpu/GrColor.h                     |   50 +-
 gfx/skia/include/gpu/GrConfig.h                    |   74 +-
 gfx/skia/include/gpu/GrContext.h                   |  445 ++--
 gfx/skia/include/gpu/GrContextFactory.h            |   56 +-
 gfx/skia/include/gpu/GrCustomStage.h               |  100 -
 gfx/skia/include/gpu/GrCustomStageUnitTest.h       |   78 -
 gfx/skia/include/gpu/GrDrawEffect.h                |   51 +
 gfx/skia/include/gpu/GrEffect.h                    |  288 +++
 gfx/skia/include/gpu/GrEffectStage.h               |  211 ++
 gfx/skia/include/gpu/GrEffectUnitTest.h            |  101 +
 gfx/skia/include/gpu/GrFontScaler.h                |    1 -
 gfx/skia/include/gpu/GrGlyph.h                     |    1 -
 gfx/skia/include/gpu/GrInstanceCounter.h           |   40 -
 gfx/skia/include/gpu/GrKey.h                       |    1 -
 gfx/skia/include/gpu/GrMatrix.h                    |   19 -
 gfx/skia/include/gpu/GrNoncopyable.h               |    1 -
 gfx/skia/include/gpu/GrOvalRenderer.h              |   46 +
 gfx/skia/include/gpu/GrPaint.h                     |  313 +--
 gfx/skia/include/gpu/GrPathRendererChain.h         |   83 +
 gfx/skia/include/gpu/GrPoint.h                     |    3 +-
 gfx/skia/include/gpu/GrProgramStageFactory.h       |  129 --
 gfx/skia/include/gpu/GrRect.h                      |    1 -
 gfx/skia/include/gpu/GrRefCnt.h                    |    1 -
 gfx/skia/include/gpu/GrRenderTarget.h              |   37 +-
 gfx/skia/include/gpu/GrResource.h                  |   45 +-
 gfx/skia/include/gpu/GrSamplerState.h              |  183 --
 gfx/skia/include/gpu/GrScalar.h                    |   49 -
 gfx/skia/include/gpu/GrSurface.h                   |   17 +-
 gfx/skia/include/gpu/GrTBackendEffectFactory.h     |   78 +
 gfx/skia/include/gpu/GrTextContext.h               |   23 +-
 gfx/skia/include/gpu/GrTexture.h                   |   64 +-
 gfx/skia/include/gpu/GrTextureAccess.h             |  153 +-
 gfx/skia/include/gpu/GrTypes.h                     |  229 +-
 gfx/skia/include/gpu/GrTypesPriv.h                 |  167 ++
 gfx/skia/include/gpu/GrUserConfig.h                |   41 +-
 gfx/skia/include/gpu/SkGpuCanvas.h                 |   57 -
 gfx/skia/include/gpu/SkGpuDevice.h                 |   71 +-
 gfx/skia/include/gpu/SkGr.h                        |    8 +-
 gfx/skia/include/gpu/SkGrPixelRef.h                |    3 +-
 gfx/skia/include/gpu/SkGrTexturePixelRef.h         |    1 -
 gfx/skia/include/gpu/gl/GrGLConfig.h               |   16 +
 gfx/skia/include/gpu/gl/GrGLConfig_chrome.h        |    7 +
 gfx/skia/include/gpu/gl/GrGLExtensions.h           |   47 +
 gfx/skia/include/gpu/gl/GrGLFunctions.h            |    9 +
 gfx/skia/include/gpu/gl/GrGLInterface.h            |    5 +
 gfx/skia/include/gpu/gl/SkANGLEGLContext.h         |    4 +-
 gfx/skia/include/gpu/gl/SkDebugGLContext.h         |    5 +-
 gfx/skia/include/gpu/gl/SkGLContext.h              |   69 -
 gfx/skia/include/gpu/gl/SkGLContextHelper.h        |   77 +
 gfx/skia/include/gpu/gl/SkMesaGLContext.h          |    4 +-
 gfx/skia/include/gpu/gl/SkNativeGLContext.h        |   34 +-
 gfx/skia/include/gpu/gl/SkNullGLContext.h          |    5 +-
 gfx/skia/include/images/SkBitmapRegionDecoder.h    |   54 +
 gfx/skia/include/images/SkFlipPixelRef.h           |  102 -
 gfx/skia/include/images/SkImageDecoder.h           |  122 +-
 gfx/skia/include/images/SkImageEncoder.h           |   34 +-
 gfx/skia/include/images/SkImageRef.h               |    6 +-
 gfx/skia/include/images/SkImages.h                 |   14 +
 gfx/skia/include/images/SkJpegUtility.h            |   66 -
 gfx/skia/include/images/SkPageFlipper.h            |    1 -
 gfx/skia/include/lazy/SkBitmapFactory.h            |   95 +
 gfx/skia/include/lazy/SkImageCache.h               |  125 ++
 gfx/skia/include/lazy/SkLruImageCache.h            |   89 +
 gfx/skia/include/lazy/SkPurgeableImageCache.h      |   45 +
 gfx/skia/include/pdf/SkPDFDevice.h                 |   54 +-
 gfx/skia/include/pdf/SkPDFDocument.h               |   13 +-
 gfx/skia/include/pipe/SkGPipe.h                    |    9 +-
 gfx/skia/include/ports/SkFontConfigInterface.h     |   86 +
 gfx/skia/include/ports/SkFontMgr.h                 |   97 +
 gfx/skia/include/ports/SkFontStyle.h               |   69 +
 gfx/skia/include/ports/SkStream_Win.h              |   46 -
 gfx/skia/include/ports/SkTypeface_android.h        |   30 +
 gfx/skia/include/ports/SkTypeface_mac.h            |    1 -
 gfx/skia/include/ports/SkTypeface_win.h            |    9 +-
 gfx/skia/include/svg/SkSVGBase.h                   |    1 -
 gfx/skia/include/text/SkTextLayout.h               |    1 -
 gfx/skia/include/utils/SkBoundaryPatch.h           |    1 -
 gfx/skia/include/utils/SkCamera.h                  |    1 -
 gfx/skia/include/utils/SkCondVar.h                 |   68 +
 gfx/skia/include/utils/SkCountdown.h               |   36 +
 gfx/skia/include/utils/SkCubicInterval.h           |    1 -
 gfx/skia/include/utils/SkDebugUtils.h              |   94 +
 gfx/skia/include/utils/SkDeferredCanvas.h          |   36 +-
 gfx/skia/include/utils/SkDumpCanvas.h              |   13 +-
 gfx/skia/include/utils/SkInterpolator.h            |    1 -
 gfx/skia/include/utils/SkMatrix44.h                |  269 ++-
 gfx/skia/include/utils/SkNWayCanvas.h              |    8 +-
 gfx/skia/include/utils/SkParse.h                   |    1 -
 gfx/skia/include/utils/SkParsePaint.h              |    1 -
 gfx/skia/include/utils/SkParsePath.h               |    1 -
 gfx/skia/include/utils/SkPictureUtils.h            |   31 +
 gfx/skia/include/utils/SkProxyCanvas.h             |    7 +-
 gfx/skia/include/utils/SkRTConf.h                  |  172 ++
 gfx/skia/include/utils/SkRandom.h                  |  323 +++
 gfx/skia/include/utils/SkRunnable.h                |   17 +
 gfx/skia/include/utils/SkThreadPool.h              |   50 +
 gfx/skia/include/utils/SkUnitMappers.h             |    1 -
 gfx/skia/include/utils/SkWGL.h                     |    8 +
 gfx/skia/include/utils/mac/SkCGUtils.h             |    3 +
 gfx/skia/include/views/SkBGViewArtist.h            |    1 -
 gfx/skia/include/views/SkEvent.h                   |   13 +-
 gfx/skia/include/views/SkEventSink.h               |    1 -
 gfx/skia/include/views/SkKey.h                     |    8 +-
 gfx/skia/include/views/SkOSMenu.h                  |    1 -
 gfx/skia/include/views/SkOSWindow_Android.h        |   11 +-
 gfx/skia/include/views/SkOSWindow_Mac.h            |    9 +-
 gfx/skia/include/views/SkOSWindow_NaCl.h           |   52 +
 gfx/skia/include/views/SkOSWindow_SDL.h            |    1 -
 gfx/skia/include/views/SkOSWindow_Unix.h           |   11 +-
 gfx/skia/include/views/SkOSWindow_Win.h            |   12 +-
 gfx/skia/include/views/SkOSWindow_iOS.h            |   13 +-
 gfx/skia/include/views/SkOSWindow_wxwidgets.h      |   35 -
 gfx/skia/include/views/SkStackViewLayout.h         |    1 -
 gfx/skia/include/views/SkTextBox.h                 |    1 -
 gfx/skia/include/views/SkTouchGesture.h            |    2 -
 gfx/skia/include/views/SkView.h                    |   17 +-
 gfx/skia/include/views/SkViewInflate.h             |    1 -
 gfx/skia/include/views/SkWidget.h                  |  125 +-
 gfx/skia/include/views/SkWindow.h                  |   17 +-
 gfx/skia/include/views/animated/SkBorderView.h     |    1 -
 gfx/skia/include/views/animated/SkScrollBarView.h  |    1 -
 gfx/skia/include/xml/SkBML_WXMLParser.h            |    1 -
 gfx/skia/include/xml/SkBML_XMLParser.h             |    1 -
 gfx/skia/include/xml/SkDOM.h                       |    1 -
 gfx/skia/include/xml/SkJS.h                        |    3 +-
 gfx/skia/include/xml/SkXMLWriter.h                 |    1 -
 gfx/skia/moz.build                                 |  423 ++--
 gfx/skia/src/animator/SkAnimate.h                  |    1 -
 gfx/skia/src/animator/SkAnimateActive.cpp          |    6 +-
 gfx/skia/src/animator/SkAnimateBase.cpp            |    2 -
 gfx/skia/src/animator/SkAnimateField.cpp           |    1 -
 gfx/skia/src/animator/SkAnimateMaker.cpp           |   16 +-
 gfx/skia/src/animator/SkAnimateMaker.h             |    1 -
 gfx/skia/src/animator/SkAnimateSet.h               |    1 -
 gfx/skia/src/animator/SkAnimator.cpp               |   35 +-
 gfx/skia/src/animator/SkAnimatorScript.cpp         |    4 +-
 gfx/skia/src/animator/SkAnimatorScript.h           |    1 -
 gfx/skia/src/animator/SkAnimatorScript2.cpp        |    1 -
 gfx/skia/src/animator/SkBoundable.cpp              |    1 -
 gfx/skia/src/animator/SkBoundable.h                |    1 -
 gfx/skia/src/animator/SkBuildCondensedInfo.cpp     |    2 -
 gfx/skia/src/animator/SkCondensedDebug.cpp         |    2 -
 gfx/skia/src/animator/SkCondensedRelease.cpp       |    1 -
 gfx/skia/src/animator/SkDisplayAdd.cpp             |    1 -
 gfx/skia/src/animator/SkDisplayAdd.h               |    2 -
 gfx/skia/src/animator/SkDisplayApply.cpp           |   15 +-
 gfx/skia/src/animator/SkDisplayApply.h             |    2 -
 gfx/skia/src/animator/SkDisplayBounds.cpp          |    3 -
 gfx/skia/src/animator/SkDisplayBounds.h            |    1 -
 gfx/skia/src/animator/SkDisplayEvent.cpp           |    4 +-
 gfx/skia/src/animator/SkDisplayEvent.h             |    3 +-
 gfx/skia/src/animator/SkDisplayEvents.h            |    1 -
 gfx/skia/src/animator/SkDisplayInclude.h           |    1 -
 gfx/skia/src/animator/SkDisplayInput.h             |    1 -
 gfx/skia/src/animator/SkDisplayList.cpp            |    2 -
 gfx/skia/src/animator/SkDisplayList.h              |    1 -
 gfx/skia/src/animator/SkDisplayMath.h              |    1 -
 gfx/skia/src/animator/SkDisplayMovie.cpp           |    4 +-
 gfx/skia/src/animator/SkDisplayMovie.h             |    1 -
 gfx/skia/src/animator/SkDisplayPost.cpp            |    5 +-
 gfx/skia/src/animator/SkDisplayPost.h              |    2 +-
 gfx/skia/src/animator/SkDisplayRandom.cpp          |    1 -
 gfx/skia/src/animator/SkDisplayRandom.h            |    1 -
 gfx/skia/src/animator/SkDisplayScreenplay.cpp      |    2 -
 gfx/skia/src/animator/SkDisplayTypes.cpp           |    3 -
 gfx/skia/src/animator/SkDisplayTypes.h             |    1 -
 gfx/skia/src/animator/SkDisplayXMLParser.cpp       |    4 +-
 gfx/skia/src/animator/SkDisplayXMLParser.h         |    2 -
 gfx/skia/src/animator/SkDisplayable.cpp            |    4 +-
 gfx/skia/src/animator/SkDisplayable.h              |    2 +-
 gfx/skia/src/animator/SkDraw3D.cpp                 |    3 -
 gfx/skia/src/animator/SkDraw3D.h                   |    1 -
 gfx/skia/src/animator/SkDrawBitmap.cpp             |   11 +-
 gfx/skia/src/animator/SkDrawBlur.cpp               |    1 -
 gfx/skia/src/animator/SkDrawBlur.h                 |    1 -
 gfx/skia/src/animator/SkDrawClip.cpp               |    1 -
 gfx/skia/src/animator/SkDrawColor.cpp              |    5 +-
 gfx/skia/src/animator/SkDrawDash.cpp               |    1 -
 gfx/skia/src/animator/SkDrawDash.h                 |    1 -
 gfx/skia/src/animator/SkDrawDiscrete.cpp           |    1 -
 gfx/skia/src/animator/SkDrawEmboss.cpp             |    1 -
 gfx/skia/src/animator/SkDrawEmboss.h               |    1 -
 gfx/skia/src/animator/SkDrawExtraPathEffect.cpp    |   39 +-
 gfx/skia/src/animator/SkDrawFull.cpp               |    1 -
 gfx/skia/src/animator/SkDrawGradient.cpp           |    2 +-
 gfx/skia/src/animator/SkDrawGradient.h             |    3 +-
 gfx/skia/src/animator/SkDrawGroup.cpp              |    8 +-
 gfx/skia/src/animator/SkDrawGroup.h                |    2 +-
 gfx/skia/src/animator/SkDrawLine.h                 |    1 -
 gfx/skia/src/animator/SkDrawMatrix.cpp             |    3 +-
 gfx/skia/src/animator/SkDrawMatrix.h               |    2 +-
 gfx/skia/src/animator/SkDrawOval.cpp               |    1 -
 gfx/skia/src/animator/SkDrawOval.h                 |    1 -
 gfx/skia/src/animator/SkDrawPaint.cpp              |   10 +-
 gfx/skia/src/animator/SkDrawPaint.h                |    1 -
 gfx/skia/src/animator/SkDrawPath.cpp               |    5 +-
 gfx/skia/src/animator/SkDrawPath.h                 |    4 +-
 gfx/skia/src/animator/SkDrawPoint.cpp              |    2 -
 gfx/skia/src/animator/SkDrawRectangle.cpp          |    3 -
 gfx/skia/src/animator/SkDrawRectangle.h            |    1 -
 gfx/skia/src/animator/SkDrawSaveLayer.cpp          |    2 -
 gfx/skia/src/animator/SkDrawText.cpp               |    1 -
 gfx/skia/src/animator/SkDrawTextBox.cpp            |    2 -
 gfx/skia/src/animator/SkDrawTextBox.h              |    1 -
 gfx/skia/src/animator/SkDrawTo.cpp                 |    1 -
 gfx/skia/src/animator/SkDrawTransparentShader.cpp  |    1 -
 gfx/skia/src/animator/SkDrawTransparentShader.h    |    1 -
 gfx/skia/src/animator/SkDrawable.cpp               |    1 -
 gfx/skia/src/animator/SkDump.cpp                   |    4 +-
 gfx/skia/src/animator/SkDump.h                     |    1 -
 gfx/skia/src/animator/SkGetCondensedInfo.cpp       |    1 -
 gfx/skia/src/animator/SkHitClear.cpp               |    3 +-
 gfx/skia/src/animator/SkHitTest.cpp                |    7 +-
 gfx/skia/src/animator/SkIntArray.h                 |    3 -
 gfx/skia/src/animator/SkMatrixParts.cpp            |    2 -
 gfx/skia/src/animator/SkMemberInfo.cpp             |    2 -
 gfx/skia/src/animator/SkMemberInfo.h               |    1 -
 gfx/skia/src/animator/SkOperandInterpolator.h      |    1 -
 gfx/skia/src/animator/SkOperandIterpolator.cpp     |    2 -
 gfx/skia/src/animator/SkPaintParts.cpp             |    4 +-
 gfx/skia/src/animator/SkParseSVGPath.cpp           |    1 -
 gfx/skia/src/animator/SkPathParts.cpp              |    2 -
 gfx/skia/src/animator/SkPathParts.h                |    1 -
 gfx/skia/src/animator/SkPostParts.cpp              |    1 -
 gfx/skia/src/animator/SkScript.cpp                 |    5 +-
 gfx/skia/src/animator/SkScript2.h                  |    1 -
 gfx/skia/src/animator/SkScriptRuntime.cpp          |    1 -
 gfx/skia/src/animator/SkScriptTokenizer.cpp        |   10 +-
 gfx/skia/src/animator/SkSnapshot.cpp               |    1 -
 gfx/skia/src/animator/SkSnapshot.h                 |    1 -
 gfx/skia/src/animator/SkTDArray_Experimental.h     |    4 +-
 gfx/skia/src/animator/SkTextToPath.cpp             |    1 -
 gfx/skia/src/animator/SkTextToPath.h               |    1 -
 gfx/skia/src/animator/SkTime.cpp                   |    1 -
 gfx/skia/src/animator/SkXMLAnimatorWriter.cpp      |    1 -
 gfx/skia/src/animator/SkXMLAnimatorWriter.h        |    1 -
 .../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h  |    1 -
 gfx/skia/src/core/SkAAClip.cpp                     |    6 +-
 gfx/skia/src/core/SkAdvancedTypefaceMetrics.cpp    |    3 -
 gfx/skia/src/core/SkAlphaRuns.cpp                  |    3 +-
 gfx/skia/src/core/SkAnnotation.cpp                 |   43 +-
 gfx/skia/src/core/SkAntiRun.h                      |    1 -
 gfx/skia/src/core/SkAutoKern.h                     |    1 -
 gfx/skia/src/core/SkBBoxHierarchy.cpp              |    1 -
 gfx/skia/src/core/SkBBoxHierarchy.h                |   33 +-
 gfx/skia/src/core/SkBBoxHierarchyRecord.cpp        |   24 +-
 gfx/skia/src/core/SkBBoxHierarchyRecord.h          |   13 +-
 gfx/skia/src/core/SkBBoxRecord.cpp                 |   51 +-
 gfx/skia/src/core/SkBBoxRecord.h                   |    8 +-
 gfx/skia/src/core/SkBitmap.cpp                     |  289 ++-
 gfx/skia/src/core/SkBitmapHeap.cpp                 |    8 +-
 gfx/skia/src/core/SkBitmapHeap.h                   |    1 +
 gfx/skia/src/core/SkBitmapProcShader.cpp           |  114 +-
 gfx/skia/src/core/SkBitmapProcShader.h             |   21 +-
 gfx/skia/src/core/SkBitmapProcState.cpp            |  378 +++-
 gfx/skia/src/core/SkBitmapProcState.h              |    4 +
 gfx/skia/src/core/SkBitmapProcState_filter.h       |   44 +
 .../src/core/SkBitmapProcState_matrixProcs.cpp     |   17 +-
 gfx/skia/src/core/SkBitmapProcState_procs.h        |    1 -
 gfx/skia/src/core/SkBitmapProcState_sample.h       |    8 +-
 gfx/skia/src/core/SkBitmapProcState_shaderproc.h   |    2 +-
 gfx/skia/src/core/SkBitmapSampler.cpp              |    3 -
 gfx/skia/src/core/SkBitmap_scroll.cpp              |    2 +-
 gfx/skia/src/core/SkBlitBWMaskTemplate.h           |    3 +-
 gfx/skia/src/core/SkBlitMask_D32.cpp               |    1 -
 gfx/skia/src/core/SkBlitRow_D16.cpp                |    1 -
 gfx/skia/src/core/SkBlitRow_D32.cpp                |    1 -
 gfx/skia/src/core/SkBlitRow_D4444.cpp              |    2 -
 gfx/skia/src/core/SkBlitter.cpp                    |  113 +-
 gfx/skia/src/core/SkBlitter.h                      |    8 +
 gfx/skia/src/core/SkBlitter_4444.cpp               |    5 +-
 gfx/skia/src/core/SkBlitter_A1.cpp                 |    1 -
 gfx/skia/src/core/SkBlitter_A8.cpp                 |    3 +-
 gfx/skia/src/core/SkBlitter_ARGB32.cpp             |  212 +-
 gfx/skia/src/core/SkBlitter_RGB16.cpp              |   16 +-
 gfx/skia/src/core/SkBlitter_Sprite.cpp             |    1 -
 gfx/skia/src/core/SkBuffer.h                       |    1 -
 gfx/skia/src/core/SkCanvas.cpp                     |  401 ++--
 gfx/skia/src/core/SkChunkAlloc.cpp                 |    1 -
 gfx/skia/src/core/SkClipStack.cpp                  |  989 ++++-----
 gfx/skia/src/core/SkColor.cpp                      |    1 -
 gfx/skia/src/core/SkColorFilter.cpp                |   57 +-
 gfx/skia/src/core/SkColorTable.cpp                 |    6 +-
 gfx/skia/src/core/SkComposeShader.cpp              |   58 +-
 gfx/skia/src/core/SkConcaveToTriangles.cpp         |  962 ---------
 gfx/skia/src/core/SkConcaveToTriangles.h           |   31 -
 gfx/skia/src/core/SkConfig8888.h                   |   31 +-
 gfx/skia/src/core/SkCordic.h                       |    1 -
 gfx/skia/src/core/SkCoreBlitters.h                 |   11 +-
 gfx/skia/src/core/SkCubicClipper.cpp               |    1 -
 gfx/skia/src/core/SkData.cpp                       |   25 +-
 gfx/skia/src/core/SkDebug.cpp                      |    1 -
 gfx/skia/src/core/SkDescriptor.h                   |    1 -
 gfx/skia/src/core/SkDevice.cpp                     |  142 +-
 gfx/skia/src/core/SkDeviceImageFilterProxy.h       |   34 +
 gfx/skia/src/core/SkDeviceProfile.cpp              |    2 -
 gfx/skia/src/core/SkDeviceProfile.h                |    1 -
 gfx/skia/src/core/SkDither.cpp                     |    1 -
 gfx/skia/src/core/SkDraw.cpp                       |  477 +++--
 gfx/skia/src/core/SkDrawProcs.h                    |   17 +-
 gfx/skia/src/core/SkEdge.cpp                       |   16 +-
 gfx/skia/src/core/SkEdge.h                         |    6 +-
 gfx/skia/src/core/SkEdgeBuilder.cpp                |    1 -
 gfx/skia/src/core/SkEdgeClipper.cpp                |    9 +-
 gfx/skia/src/core/SkFDStream.cpp                   |  104 +
 gfx/skia/src/core/SkFDot6.h                        |    4 +-
 gfx/skia/src/core/SkFilterProc.h                   |    2 -
 gfx/skia/src/core/SkFilterShader.h                 |   17 +-
 gfx/skia/src/core/SkFlate.cpp                      |    1 -
 gfx/skia/src/core/SkFlattenable.cpp                |    6 +-
 gfx/skia/src/core/SkFloat.cpp                      |    2 +-
 gfx/skia/src/core/SkFloatBits.cpp                  |    1 -
 gfx/skia/src/core/SkFontDescriptor.cpp             |   79 +
 gfx/skia/src/core/SkFontDescriptor.h               |   46 +
 gfx/skia/src/core/SkFontHost.cpp                   |  172 +-
 gfx/skia/src/core/SkFontStream.cpp                 |  210 ++
 gfx/skia/src/core/SkFontStream.h                   |   49 +
 gfx/skia/src/core/SkGeometry.cpp                   |   64 +-
 gfx/skia/src/core/SkGlyphCache.cpp                 |   23 +-
 gfx/skia/src/core/SkGlyphCache.h                   |   21 +-
 gfx/skia/src/core/SkGraphics.cpp                   |   12 +-
 gfx/skia/src/core/SkImageFilter.cpp                |   79 +-
 gfx/skia/src/core/SkInstCnt.cpp                    |    2 +-
 gfx/skia/src/core/SkLineClipper.cpp                |    3 +-
 gfx/skia/src/core/SkMMapStream.cpp                 |   78 -
 gfx/skia/src/core/SkMallocPixelRef.cpp             |    2 -
 gfx/skia/src/core/SkMask.cpp                       |    1 -
 gfx/skia/src/core/SkMaskFilter.cpp                 |  212 +-
 gfx/skia/src/core/SkMaskGamma.cpp                  |   94 +-
 gfx/skia/src/core/SkMaskGamma.h                    |  131 +-
 gfx/skia/src/core/SkMath.cpp                       |    2 +-
 gfx/skia/src/core/SkMathPriv.h                     |    1 -
 gfx/skia/src/core/SkMatrix.cpp                     |  155 +-
 gfx/skia/src/core/SkMatrixUtils.h                  |   43 +
 gfx/skia/src/core/SkMemory_stdlib.cpp              |    1 -
 gfx/skia/src/core/SkMetaData.cpp                   |    1 -
 gfx/skia/src/core/SkOrderedReadBuffer.cpp          |   37 +-
 gfx/skia/src/core/SkOrderedReadBuffer.h            |   17 +-
 gfx/skia/src/core/SkOrderedWriteBuffer.cpp         |  100 +-
 gfx/skia/src/core/SkOrderedWriteBuffer.h           |   25 +-
 gfx/skia/src/core/SkPaint.cpp                      |  456 ++--
 gfx/skia/src/core/SkPaintPriv.cpp                  |   78 +
 gfx/skia/src/core/SkPaintPriv.h                    |   25 +
 gfx/skia/src/core/SkPath.cpp                       |  603 ++++--
 gfx/skia/src/core/SkPathEffect.cpp                 |  122 +-
 gfx/skia/src/core/SkPathHeap.cpp                   |    5 +-
 gfx/skia/src/core/SkPathHeap.h                     |    1 -
 gfx/skia/src/core/SkPathMeasure.cpp                |   21 +-
 gfx/skia/src/core/SkPathRef.h                      |  101 +-
 gfx/skia/src/core/SkPicture.cpp                    |   99 +-
 gfx/skia/src/core/SkPictureFlat.cpp                |    3 +-
 gfx/skia/src/core/SkPictureFlat.h                  |  167 +-
 gfx/skia/src/core/SkPicturePlayback.cpp            |  283 ++-
 gfx/skia/src/core/SkPicturePlayback.h              |   33 +-
 gfx/skia/src/core/SkPictureRecord.cpp              |  913 ++++++--
 gfx/skia/src/core/SkPictureRecord.h                |   76 +-
 gfx/skia/src/core/SkPictureStateTree.cpp           |   15 +-
 gfx/skia/src/core/SkPictureStateTree.h             |   16 +-
 gfx/skia/src/core/SkPixelRef.cpp                   |    6 +
 gfx/skia/src/core/SkPtrRecorder.cpp                |    2 -
 gfx/skia/src/core/SkPtrRecorder.h                  |    4 +-
 gfx/skia/src/core/SkQuadClipper.cpp                |    1 -
 gfx/skia/src/core/SkRRect.cpp                      |  332 +++
 gfx/skia/src/core/SkRTree.cpp                      |   19 +-
 gfx/skia/src/core/SkRTree.h                        |   34 +-
 gfx/skia/src/core/SkRasterClip.cpp                 |    1 -
 gfx/skia/src/core/SkRasterClip.h                   |    1 -
 gfx/skia/src/core/SkRasterizer.cpp                 |    5 +-
 gfx/skia/src/core/SkRect.cpp                       |    1 -
 gfx/skia/src/core/SkRefCnt.cpp                     |    1 -
 gfx/skia/src/core/SkRefDict.cpp                    |    2 +-
 gfx/skia/src/core/SkRegion.cpp                     |   45 +-
 gfx/skia/src/core/SkRegionPriv.h                   |    8 -
 gfx/skia/src/core/SkRegion_path.cpp                |    1 -
 gfx/skia/src/core/SkScalerContext.cpp              |  282 +--
 gfx/skia/src/core/SkScalerContext.h                |   53 +-
 gfx/skia/src/core/SkScan.cpp                       |    1 -
 gfx/skia/src/core/SkScanPriv.h                     |    1 -
 gfx/skia/src/core/SkScan_AntiPath.cpp              |    1 -
 gfx/skia/src/core/SkScan_Antihair.cpp              |  313 ++-
 gfx/skia/src/core/SkScan_Hairline.cpp              |   17 +-
 gfx/skia/src/core/SkScan_Path.cpp                  |    7 -
 gfx/skia/src/core/SkShader.cpp                     |  123 +-
 gfx/skia/src/core/SkSpriteBlitter.h                |    1 -
 gfx/skia/src/core/SkSpriteBlitterTemplate.h        |    4 +-
 gfx/skia/src/core/SkSpriteBlitter_ARGB32.cpp       |   16 +-
 gfx/skia/src/core/SkSpriteBlitter_RGB16.cpp        |    8 +-
 gfx/skia/src/core/SkStream.cpp                     |  126 +-
 gfx/skia/src/core/SkString.cpp                     |   28 +-
 gfx/skia/src/core/SkStringUtils.cpp                |   19 +
 gfx/skia/src/core/SkStroke.cpp                     |  183 +-
 gfx/skia/src/core/SkStroke.h                       |   12 +-
 gfx/skia/src/core/SkStrokeRec.cpp                  |  105 +
 gfx/skia/src/core/SkStrokerPriv.cpp                |    3 -
 gfx/skia/src/core/SkStrokerPriv.h                  |    1 -
 gfx/skia/src/core/SkTLList.h                       |  385 ++++
 gfx/skia/src/core/SkTLS.cpp                        |    1 -
 gfx/skia/src/core/SkTSearch.cpp                    |    1 -
 gfx/skia/src/core/SkTSort.h                        |  229 +-
 gfx/skia/src/core/SkTextToPathIter.h               |    1 -
 gfx/skia/src/core/SkTileGrid.cpp                   |  132 ++
 gfx/skia/src/core/SkTileGrid.h                     |  122 ++
 gfx/skia/src/core/SkTileGridPicture.cpp            |   28 +
 gfx/skia/src/core/SkTypeface.cpp                   |  123 +-
 gfx/skia/src/core/SkTypefaceCache.cpp              |    3 +-
 gfx/skia/src/core/SkTypefacePriv.h                 |   38 +
 gfx/skia/src/core/SkUtils.cpp                      |   34 -
 gfx/skia/src/core/SkUtilsArm.cpp                   |   22 +
 gfx/skia/src/core/SkUtilsArm.h                     |    8 +-
 gfx/skia/src/core/SkWriter32.cpp                   |  212 +-
 gfx/skia/src/core/SkXfermode.cpp                   |  753 ++++---
 gfx/skia/src/device/xps/SkXPSDevice.cpp            |   88 +-
 gfx/skia/src/effects/Sk1DPathEffect.cpp            |   16 +-
 gfx/skia/src/effects/Sk2DPathEffect.cpp            |   29 +-
 gfx/skia/src/effects/SkArithmeticMode.cpp          |   27 +-
 gfx/skia/src/effects/SkAvoidXfermode.cpp           |   52 +-
 gfx/skia/src/effects/SkBicubicImageFilter.cpp      |  372 ++++
 gfx/skia/src/effects/SkBitmapSource.cpp            |    6 +-
 gfx/skia/src/effects/SkBlendImageFilter.cpp        |  336 +--
 gfx/skia/src/effects/SkBlurDrawLooper.cpp          |   39 +-
 gfx/skia/src/effects/SkBlurImageFilter.cpp         |   22 +-
 gfx/skia/src/effects/SkBlurMask.cpp                | 1009 ++++++++-
 gfx/skia/src/effects/SkBlurMask.h                  |   22 +-
 gfx/skia/src/effects/SkBlurMaskFilter.cpp          |  251 ++-
 gfx/skia/src/effects/SkColorFilterImageFilter.cpp  |   81 +-
 gfx/skia/src/effects/SkColorFilters.cpp            |   45 +-
 gfx/skia/src/effects/SkColorMatrix.cpp             |    1 -
 gfx/skia/src/effects/SkColorMatrixFilter.cpp       |  252 ++-
 gfx/skia/src/effects/SkCornerPathEffect.cpp        |   16 +-
 gfx/skia/src/effects/SkDashPathEffect.cpp          |  316 ++-
 gfx/skia/src/effects/SkDiscretePathEffect.cpp      |    7 +-
 gfx/skia/src/effects/SkDisplacementMapEffect.cpp   |  534 +++++
 gfx/skia/src/effects/SkEmbossMask.cpp              |    2 -
 gfx/skia/src/effects/SkEmbossMask.h                |    1 -
 gfx/skia/src/effects/SkEmbossMaskFilter.cpp        |   26 +-
 gfx/skia/src/effects/SkImageFilterUtils.cpp        |   46 +
 gfx/skia/src/effects/SkKernel33MaskFilter.cpp      |   30 +-
 gfx/skia/src/effects/SkLayerDrawLooper.cpp         |   98 +-
 gfx/skia/src/effects/SkLayerRasterizer.cpp         |    5 +-
 gfx/skia/src/effects/SkLightingImageFilter.cpp     |  652 +++---
 gfx/skia/src/effects/SkMagnifierImageFilter.cpp    |  269 +--
 .../src/effects/SkMatrixConvolutionImageFilter.cpp |  581 ++++++
 gfx/skia/src/effects/SkMergeImageFilter.cpp        |  165 ++
 gfx/skia/src/effects/SkMorphologyImageFilter.cpp   |  230 +-
 gfx/skia/src/effects/SkOffsetImageFilter.cpp       |   49 +
 gfx/skia/src/effects/SkPaintFlagsDrawFilter.cpp    |    6 +-
 gfx/skia/src/effects/SkPixelXorXfermode.cpp        |   10 +-
 gfx/skia/src/effects/SkPorterDuff.cpp              |    3 +-
 gfx/skia/src/effects/SkRectShaderImageFilter.cpp   |   58 +
 gfx/skia/src/effects/SkRectShape.cpp               |   90 -
 gfx/skia/src/effects/SkSingleInputImageFilter.cpp  |   85 -
 gfx/skia/src/effects/SkStippleMaskFilter.cpp       |   10 +-
 gfx/skia/src/effects/SkTableColorFilter.cpp        |  216 +-
 gfx/skia/src/effects/SkTableMaskFilter.cpp         |   24 +-
 gfx/skia/src/effects/SkTestImageFilters.cpp        |  255 +--
 gfx/skia/src/effects/SkTransparentShader.cpp       |   11 +-
 gfx/skia/src/effects/gradients/SkBitmapCache.cpp   |    1 -
 gfx/skia/src/effects/gradients/SkBitmapCache.h     |    1 -
 gfx/skia/src/effects/gradients/SkClampRange.cpp    |    1 -
 gfx/skia/src/effects/gradients/SkClampRange.h      |    1 -
 .../src/effects/gradients/SkGradientShader.cpp     |  352 ++--
 .../src/effects/gradients/SkGradientShaderPriv.h   |  183 +-
 .../src/effects/gradients/SkLinearGradient.cpp     |  231 +--
 gfx/skia/src/effects/gradients/SkLinearGradient.h  |    5 +-
 .../src/effects/gradients/SkRadialGradient.cpp     |  162 +-
 gfx/skia/src/effects/gradients/SkRadialGradient.h  |    5 +-
 gfx/skia/src/effects/gradients/SkSweepGradient.cpp |  126 +-
 gfx/skia/src/effects/gradients/SkSweepGradient.h   |    5 +-
 .../gradients/SkTwoPointConicalGradient.cpp        |  556 ++---
 .../effects/gradients/SkTwoPointConicalGradient.h  |    6 +-
 .../effects/gradients/SkTwoPointRadialGradient.cpp |  413 ++--
 .../effects/gradients/SkTwoPointRadialGradient.h   |    5 +-
 gfx/skia/src/gpu/FlingState.cpp                    |    2 -
 gfx/skia/src/gpu/GrAAConvexPathRenderer.cpp        |  230 +-
 gfx/skia/src/gpu/GrAAConvexPathRenderer.h          |    5 +-
 gfx/skia/src/gpu/GrAAHairLinePathRenderer.cpp      |  323 ++-
 gfx/skia/src/gpu/GrAAHairLinePathRenderer.h        |   11 +-
 gfx/skia/src/gpu/GrAARectRenderer.cpp              |  135 +-
 gfx/skia/src/gpu/GrAddPathRenderers_default.cpp    |   26 +-
 gfx/skia/src/gpu/GrAllocPool.cpp                   |    2 -
 gfx/skia/src/gpu/GrAllocPool.h                     |    1 -
 gfx/skia/src/gpu/GrAtlas.cpp                       |    5 +-
 gfx/skia/src/gpu/GrAtlas.h                         |    3 -
 gfx/skia/src/gpu/GrBinHashKey.h                    |   37 +-
 gfx/skia/src/gpu/GrBufferAllocPool.cpp             |   53 +-
 gfx/skia/src/gpu/GrBufferAllocPool.h               |   18 +-
 gfx/skia/src/gpu/GrCacheID.cpp                     |   48 +-
 gfx/skia/src/gpu/GrClipData.cpp                    |    1 -
 gfx/skia/src/gpu/GrClipMaskCache.cpp               |    1 -
 gfx/skia/src/gpu/GrClipMaskCache.h                 |   49 +-
 gfx/skia/src/gpu/GrClipMaskManager.cpp             | 1177 +++++------
 gfx/skia/src/gpu/GrClipMaskManager.h               |   78 +-
 gfx/skia/src/gpu/GrContext.cpp                     | 1139 +++++-----
 gfx/skia/src/gpu/GrCustomStage.cpp                 |   81 -
 gfx/skia/src/gpu/GrDefaultPathRenderer.cpp         |  121 +-
 gfx/skia/src/gpu/GrDefaultPathRenderer.h           |   59 +-
 gfx/skia/src/gpu/GrDrawState.cpp                   |  443 ++++
 gfx/skia/src/gpu/GrDrawState.h                     |  944 ++++++---
 gfx/skia/src/gpu/GrDrawTarget.cpp                  | 1092 +++-------
 gfx/skia/src/gpu/GrDrawTarget.h                    |  764 ++-----
 gfx/skia/src/gpu/GrDrawTargetCaps.h                |   63 +
 gfx/skia/src/gpu/GrEffect.cpp                      |  104 +
 gfx/skia/src/gpu/GrGeometryBuffer.h                |   22 +-
 gfx/skia/src/gpu/GrGpu.cpp                         |  123 +-
 gfx/skia/src/gpu/GrGpu.h                           |  215 +-
 gfx/skia/src/gpu/GrGpuFactory.cpp                  |   12 +-
 gfx/skia/src/gpu/GrGpuVertex.h                     |   97 -
 gfx/skia/src/gpu/GrInOrderDrawBuffer.cpp           |  814 ++++----
 gfx/skia/src/gpu/GrInOrderDrawBuffer.h             |  193 +-
 gfx/skia/src/gpu/GrIndexBuffer.h                   |   20 +-
 gfx/skia/src/gpu/GrMatrix.cpp                      |  713 -------
 gfx/skia/src/gpu/GrMemory.cpp                      |    2 -
 gfx/skia/src/gpu/GrMemoryPool.cpp                  |    3 +-
 gfx/skia/src/gpu/GrOvalRenderer.cpp                |  524 +++++
 gfx/skia/src/gpu/GrPath.h                          |    2 +-
 gfx/skia/src/gpu/GrPathRenderer.cpp                |    1 -
 gfx/skia/src/gpu/GrPathRenderer.h                  |  172 +-
 gfx/skia/src/gpu/GrPathRendererChain.cpp           |   47 +-
 gfx/skia/src/gpu/GrPathRendererChain.h             |   68 -
 gfx/skia/src/gpu/GrPathUtils.cpp                   |   68 +-
 gfx/skia/src/gpu/GrPathUtils.h                     |   18 +-
 gfx/skia/src/gpu/GrPlotMgr.h                       |    1 -
 gfx/skia/src/gpu/GrRandom.h                        |   55 -
 gfx/skia/src/gpu/GrRectanizer.cpp                  |    4 +-
 gfx/skia/src/gpu/GrRectanizer.h                    |    3 -
 gfx/skia/src/gpu/GrRectanizer_fifo.cpp             |    2 -
 gfx/skia/src/gpu/GrRedBlackTree.h                  |    6 +-
 gfx/skia/src/gpu/GrReducedClip.cpp                 |  415 ++++
 gfx/skia/src/gpu/GrReducedClip.h                   |   40 +
 gfx/skia/src/gpu/GrRenderTarget.cpp                |    4 +
 gfx/skia/src/gpu/GrResource.cpp                    |   14 +-
 gfx/skia/src/gpu/GrResourceCache.cpp               |  123 +-
 gfx/skia/src/gpu/GrResourceCache.h                 |  239 ++-
 gfx/skia/src/gpu/GrSWMaskHelper.cpp                |   91 +-
 gfx/skia/src/gpu/GrSWMaskHelper.h                  |   15 +-
 gfx/skia/src/gpu/GrSoftwarePathRenderer.cpp        |   33 +-
 gfx/skia/src/gpu/GrSoftwarePathRenderer.h          |   19 +-
 gfx/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp |   67 +-
 gfx/skia/src/gpu/GrStencilAndCoverPathRenderer.h   |   33 +-
 gfx/skia/src/gpu/GrStencilBuffer.cpp               |   40 +-
 gfx/skia/src/gpu/GrStencilBuffer.h                 |   54 +-
 gfx/skia/src/gpu/GrSurface.cpp                     |    1 -
 gfx/skia/src/gpu/GrTBSearch.h                      |    1 -
 gfx/skia/src/gpu/GrTDArray.h                       |  216 --
 gfx/skia/src/gpu/GrTHashCache.h                    |   67 +-
 gfx/skia/src/gpu/GrTLList.h                        |   54 -
 gfx/skia/src/gpu/GrTextContext.cpp                 |  187 +-
 gfx/skia/src/gpu/GrTextStrike.cpp                  |    4 +-
 gfx/skia/src/gpu/GrTextStrike.h                    |    1 -
 gfx/skia/src/gpu/GrTextStrike_impl.h               |    1 -
 gfx/skia/src/gpu/GrTexture.cpp                     |  129 +-
 gfx/skia/src/gpu/GrTextureAccess.cpp               |   92 +-
 gfx/skia/src/gpu/GrVertexBuffer.h                  |    4 +-
 gfx/skia/src/gpu/SkGpuCanvas.cpp                   |   46 -
 gfx/skia/src/gpu/SkGpuDevice.cpp                   | 1265 ++++++-----
 gfx/skia/src/gpu/SkGr.cpp                          |  116 +-
 gfx/skia/src/gpu/SkGrFontScaler.cpp                |    3 -
 gfx/skia/src/gpu/SkGrPixelRef.cpp                  |   34 +-
 .../android/GrGLCreateNativeInterface_android.cpp  |  135 --
 .../src/gpu/android/SkNativeGLContext_android.cpp  |  104 -
 gfx/skia/src/gpu/app-android.cpp                   |  393 ----
 gfx/skia/src/gpu/effects/Gr1DKernelEffect.h        |    4 +-
 gfx/skia/src/gpu/effects/GrColorTableEffect.cpp    |  121 --
 gfx/skia/src/gpu/effects/GrColorTableEffect.h      |   43 -
 .../src/gpu/effects/GrConfigConversionEffect.cpp   |  169 +-
 .../src/gpu/effects/GrConfigConversionEffect.h     |   24 +-
 gfx/skia/src/gpu/effects/GrConvolutionEffect.cpp   |  141 +-
 gfx/skia/src/gpu/effects/GrConvolutionEffect.h     |   47 +-
 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.cpp |  128 ++
 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.h   |  104 +
 gfx/skia/src/gpu/effects/GrSingleTextureEffect.cpp |   78 +-
 gfx/skia/src/gpu/effects/GrSingleTextureEffect.h   |   60 +-
 gfx/skia/src/gpu/effects/GrTextureDomainEffect.cpp |  250 ++-
 gfx/skia/src/gpu/effects/GrTextureDomainEffect.h   |   63 +-
 gfx/skia/src/gpu/effects/GrTextureStripAtlas.cpp   |   84 +-
 gfx/skia/src/gpu/effects/GrTextureStripAtlas.h     |   32 +-
 gfx/skia/src/gpu/gl/GrGLBufferImpl.cpp             |  164 ++
 gfx/skia/src/gpu/gl/GrGLBufferImpl.h               |   60 +
 gfx/skia/src/gpu/gl/GrGLCaps.cpp                   |  200 +-
 gfx/skia/src/gpu/gl/GrGLCaps.h                     |   48 +-
 gfx/skia/src/gpu/gl/GrGLContext.cpp                |   88 +
 gfx/skia/src/gpu/gl/GrGLContext.h                  |  126 ++
 gfx/skia/src/gpu/gl/GrGLContextInfo.cpp            |   84 -
 gfx/skia/src/gpu/gl/GrGLContextInfo.h              |   86 -
 gfx/skia/src/gpu/gl/GrGLCreateNullInterface.cpp    |  428 +---
 gfx/skia/src/gpu/gl/GrGLDefines.h                  |   10 +
 gfx/skia/src/gpu/gl/GrGLEffect.cpp                 |   50 +
 gfx/skia/src/gpu/gl/GrGLEffect.h                   |   99 +
 gfx/skia/src/gpu/gl/GrGLEffectMatrix.cpp           |  238 +++
 gfx/skia/src/gpu/gl/GrGLEffectMatrix.h             |  121 ++
 gfx/skia/src/gpu/gl/GrGLExtensions.cpp             |   83 +
 gfx/skia/src/gpu/gl/GrGLIRect.h                    |   11 +-
 gfx/skia/src/gpu/gl/GrGLIndexBuffer.cpp            |  116 +-
 gfx/skia/src/gpu/gl/GrGLIndexBuffer.h              |   29 +-
 gfx/skia/src/gpu/gl/GrGLInterface.cpp              |   82 +-
 gfx/skia/src/gpu/gl/GrGLNoOpInterface.cpp          |  613 ++++++
 gfx/skia/src/gpu/gl/GrGLNoOpInterface.h            |  347 ++++
 gfx/skia/src/gpu/gl/GrGLPath.cpp                   |    9 +-
 gfx/skia/src/gpu/gl/GrGLProgram.cpp                |  814 ++++----
 gfx/skia/src/gpu/gl/GrGLProgram.h                  |  288 +--
 gfx/skia/src/gpu/gl/GrGLProgramDesc.cpp            |  191 ++
 gfx/skia/src/gpu/gl/GrGLProgramDesc.h              |  115 +
 gfx/skia/src/gpu/gl/GrGLProgramStage.cpp           |   40 -
 gfx/skia/src/gpu/gl/GrGLProgramStage.h             |   90 -
 gfx/skia/src/gpu/gl/GrGLRenderTarget.cpp           |   16 +-
 gfx/skia/src/gpu/gl/GrGLRenderTarget.h             |   27 +-
 gfx/skia/src/gpu/gl/GrGLSL.cpp                     |   26 +-
 gfx/skia/src/gpu/gl/GrGLSL.h                       |   39 +-
 gfx/skia/src/gpu/gl/GrGLShaderBuilder.cpp          |  444 +++-
 gfx/skia/src/gpu/gl/GrGLShaderBuilder.h            |  300 ++-
 gfx/skia/src/gpu/gl/GrGLShaderVar.h                |   43 +-
 gfx/skia/src/gpu/gl/GrGLStencilBuffer.cpp          |    4 +-
 gfx/skia/src/gpu/gl/GrGLStencilBuffer.h            |    6 +-
 gfx/skia/src/gpu/gl/GrGLTexture.cpp                |   11 +-
 gfx/skia/src/gpu/gl/GrGLTexture.h                  |   29 +-
 gfx/skia/src/gpu/gl/GrGLUniformManager.cpp         |   20 +-
 gfx/skia/src/gpu/gl/GrGLUniformManager.h           |   10 +-
 gfx/skia/src/gpu/gl/GrGLUtil.cpp                   |   35 +-
 gfx/skia/src/gpu/gl/GrGLUtil.h                     |   15 +-
 gfx/skia/src/gpu/gl/GrGLVertexArray.cpp            |  123 ++
 gfx/skia/src/gpu/gl/GrGLVertexArray.h              |  174 ++
 gfx/skia/src/gpu/gl/GrGLVertexBuffer.cpp           |  129 +-
 gfx/skia/src/gpu/gl/GrGLVertexBuffer.h             |   32 +-
 gfx/skia/src/gpu/gl/GrGpuGL.cpp                    |  849 ++++----
 gfx/skia/src/gpu/gl/GrGpuGL.h                      |  342 +--
 gfx/skia/src/gpu/gl/GrGpuGL_program.cpp            |  808 ++------
 gfx/skia/src/gpu/gl/SkGLContext.cpp                |  139 --
 gfx/skia/src/gpu/gl/SkGLContextHelper.cpp          |  139 ++
 .../android/GrGLCreateNativeInterface_android.cpp  |  146 ++
 .../gpu/gl/android/SkNativeGLContext_android.cpp   |  104 +
 .../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp  |   15 +-
 gfx/skia/src/gpu/gl/debug/GrDebugGL.cpp            |   14 +-
 gfx/skia/src/gpu/gl/debug/GrDebugGL.h              |   27 +-
 .../src/gpu/gl/debug/GrGLCreateDebugInterface.cpp  |  807 ++------
 gfx/skia/src/gpu/gl/debug/GrTextureUnitObj.cpp     |    1 -
 gfx/skia/src/gpu/gl/debug/GrVertexArrayObj.h       |   21 +
 .../gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp   |  147 ++
 gfx/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm   |   62 +
 .../gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp   |  410 ++--
 gfx/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp  |   48 +-
 .../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp    |   45 +-
 gfx/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp       |    4 +-
 gfx/skia/src/gpu/gl/mesa/osmesa_wrapper.h          |   16 +
 .../src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp     |   34 +
 .../gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp |   50 +-
 .../gpu/gl/win/GrGLCreateNativeInterface_win.cpp   |  457 ++--
 gfx/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp  |   27 +-
 gfx/skia/src/gpu/gr_hello_world.cpp                |   37 -
 gfx/skia/src/gpu/gr_unittests.cpp                  |   42 +-
 gfx/skia/src/gpu/ios/GrGLDefaultInterface_iOS.cpp  |  142 --
 gfx/skia/src/image/SkDataPixelRef.cpp              |    2 -
 gfx/skia/src/image/SkImage.cpp                     |    1 -
 gfx/skia/src/image/SkImagePriv.cpp                 |    4 +-
 gfx/skia/src/image/SkImagePriv.h                   |   10 +
 gfx/skia/src/image/SkImage_Base.h                  |    3 +-
 gfx/skia/src/image/SkImage_Codec.cpp               |    1 -
 gfx/skia/src/image/SkImage_Gpu.cpp                 |   80 +-
 gfx/skia/src/image/SkImage_Picture.cpp             |    1 -
 gfx/skia/src/image/SkImage_Raster.cpp              |   24 +-
 gfx/skia/src/image/SkSurface.cpp                   |    7 +-
 gfx/skia/src/image/SkSurface_Base.h                |    5 +-
 gfx/skia/src/image/SkSurface_Gpu.cpp               |  162 +-
 gfx/skia/src/image/SkSurface_Picture.cpp           |   14 +-
 gfx/skia/src/image/SkSurface_Raster.cpp            |   39 +-
 gfx/skia/src/images/SkBitmapRegionDecoder.cpp      |   14 +
 gfx/skia/src/images/SkFDStream.cpp                 |   92 -
 gfx/skia/src/images/SkFlipPixelRef.cpp             |  127 --
 gfx/skia/src/images/SkImageDecoder.cpp             |  156 +-
 gfx/skia/src/images/SkImageDecoder_Factory.cpp     |   22 +-
 gfx/skia/src/images/SkImageDecoder_libbmp.cpp      |   27 +-
 gfx/skia/src/images/SkImageDecoder_libgif.cpp      |   43 +-
 gfx/skia/src/images/SkImageDecoder_libico.cpp      |   24 +-
 gfx/skia/src/images/SkImageDecoder_libjpeg.cpp     |  511 ++++-
 gfx/skia/src/images/SkImageDecoder_libpng.cpp      |  729 ++++---
 gfx/skia/src/images/SkImageDecoder_libwebp.cpp     |  595 ++++++
 gfx/skia/src/images/SkImageDecoder_wbmp.cpp        |   23 +-
 gfx/skia/src/images/SkImageEncoder.cpp             |    1 -
 gfx/skia/src/images/SkImageEncoder_Factory.cpp     |    9 -
 gfx/skia/src/images/SkImageRef.cpp                 |   22 +-
 gfx/skia/src/images/SkImageRefPool.cpp             |    1 -
 gfx/skia/src/images/SkImageRefPool.h               |    1 -
 gfx/skia/src/images/SkImageRef_GlobalPool.cpp      |   30 +-
 gfx/skia/src/images/SkImageRef_ashmem.cpp          |  231 +++
 gfx/skia/src/images/SkImageRef_ashmem.h            |   47 +
 gfx/skia/src/images/SkImages.cpp                   |   21 +
 gfx/skia/src/images/SkJpegUtility.cpp              |   65 +-
 gfx/skia/src/images/SkJpegUtility.h                |   66 +
 gfx/skia/src/images/SkMovie.cpp                    |   19 +-
 gfx/skia/src/images/SkMovie_gif.cpp                |   10 +-
 gfx/skia/src/images/SkPageFlipper.cpp              |    2 -
 gfx/skia/src/images/SkScaledBitmapSampler.h        |    2 +-
 gfx/skia/src/images/transform_scanline.h           |  140 ++
 gfx/skia/src/lazy/SkBitmapFactory.cpp              |   81 +
 gfx/skia/src/lazy/SkLazyPixelRef.cpp               |  147 ++
 gfx/skia/src/lazy/SkLazyPixelRef.h                 |   81 +
 gfx/skia/src/lazy/SkLruImageCache.cpp              |  203 ++
 gfx/skia/src/lazy/SkPurgeableImageCache.cpp        |  159 ++
 gfx/skia/src/lazy/SkPurgeableMemoryBlock.h         |   94 +
 .../src/lazy/SkPurgeableMemoryBlock_common.cpp     |   16 +
 .../opts/SkBitmapProcState_matrixProcs_neon.cpp    |    1 -
 .../src/opts/SkBitmapProcState_matrix_clamp_neon.h |   23 +-
 .../opts/SkBitmapProcState_matrix_repeat_neon.h    |   20 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp  |    8 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp |    4 +-
 gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp   |    1 -
 gfx/skia/src/opts/SkBitmapProcState_opts_none.cpp  |    2 -
 gfx/skia/src/opts/SkBlitRect_opts_SSE2.cpp         |    4 +-
 gfx/skia/src/opts/SkBlitRect_opts_SSE2.h           |    1 -
 gfx/skia/src/opts/SkBlitRow_opts_arm_neon.cpp      |   10 +-
 gfx/skia/src/opts/SkBlitRow_opts_none.cpp          |    1 -
 gfx/skia/src/opts/SkUtils_opts_none.cpp            |    2 -
 gfx/skia/src/opts/opts_check_SSE2.cpp              |    8 +-
 gfx/skia/src/opts/opts_check_arm.cpp               |    7 +-
 gfx/skia/src/pdf/SkPDFCatalog.cpp                  |   35 +-
 gfx/skia/src/pdf/SkPDFCatalog.h                    |    6 +-
 gfx/skia/src/pdf/SkPDFDevice.cpp                   |  537 +++--
 gfx/skia/src/pdf/SkPDFDocument.cpp                 |  127 +-
 gfx/skia/src/pdf/SkPDFFont.cpp                     |  239 +--
 gfx/skia/src/pdf/SkPDFFont.h                       |   15 +-
 gfx/skia/src/pdf/SkPDFFontImpl.h                   |    3 +-
 gfx/skia/src/pdf/SkPDFFormXObject.cpp              |   19 +-
 gfx/skia/src/pdf/SkPDFFormXObject.h                |    5 +-
 gfx/skia/src/pdf/SkPDFGraphicState.cpp             |   30 +-
 gfx/skia/src/pdf/SkPDFGraphicState.h               |    3 +-
 gfx/skia/src/pdf/SkPDFImage.cpp                    |   36 +-
 gfx/skia/src/pdf/SkPDFImage.h                      |    9 +-
 gfx/skia/src/pdf/SkPDFPage.cpp                     |   52 +-
 gfx/skia/src/pdf/SkPDFPage.h                       |   15 +-
 gfx/skia/src/pdf/SkPDFShader.cpp                   |   48 +-
 gfx/skia/src/pdf/SkPDFStream.cpp                   |   18 +-
 gfx/skia/src/pdf/SkPDFStream.h                     |    4 +-
 gfx/skia/src/pdf/SkPDFTypes.cpp                    |   33 +-
 gfx/skia/src/pdf/SkPDFTypes.h                      |   34 +-
 gfx/skia/src/pdf/SkPDFUtils.cpp                    |    2 +-
 gfx/skia/src/pdf/SkTSet.h                          |  280 +++
 gfx/skia/src/pipe/SkGPipePriv.h                    |    8 +-
 gfx/skia/src/pipe/SkGPipeRead.cpp                  |  128 +-
 gfx/skia/src/pipe/SkGPipeWrite.cpp                 |   53 +-
 gfx/skia/src/pipe/utils/SamplePipeControllers.cpp  |    6 +-
 gfx/skia/src/pipe/utils/SamplePipeControllers.h    |    2 +-
 .../src/ports/FontHostConfiguration_android.cpp    |   76 +-
 gfx/skia/src/ports/FontHostConfiguration_android.h |   23 +-
 gfx/skia/src/ports/SkDebug_android.cpp             |   13 +
 gfx/skia/src/ports/SkDebug_nacl.cpp                |   38 +
 gfx/skia/src/ports/SkDebug_stdio.cpp               |    7 +-
 gfx/skia/src/ports/SkDebug_win.cpp                 |    7 +-
 .../src/ports/SkFontConfigInterface_direct.cpp     |  431 ++++
 gfx/skia/src/ports/SkFontDescriptor.cpp            |   79 -
 gfx/skia/src/ports/SkFontDescriptor.h              |   46 -
 gfx/skia/src/ports/SkFontHost_FONTPATH.cpp         |  323 ---
 gfx/skia/src/ports/SkFontHost_FreeType.cpp         |  330 ++-
 gfx/skia/src/ports/SkFontHost_FreeType_common.cpp  |  104 +-
 gfx/skia/src/ports/SkFontHost_FreeType_common.h    |   33 +-
 gfx/skia/src/ports/SkFontHost_android.cpp          |  385 ++--
 gfx/skia/src/ports/SkFontHost_android_old.cpp      |  664 ------
 gfx/skia/src/ports/SkFontHost_ascender.cpp         |  230 --
 gfx/skia/src/ports/SkFontHost_fontconfig.cpp       |  466 ++---
 gfx/skia/src/ports/SkFontHost_freetype_mac.cpp     |  106 -
 gfx/skia/src/ports/SkFontHost_linux.cpp            |  251 +--
 gfx/skia/src/ports/SkFontHost_mac.cpp              | 2190 +++++++++++++++++++-
 gfx/skia/src/ports/SkFontHost_mac_atsui.cpp        |  593 ------
 gfx/skia/src/ports/SkFontHost_mac_coretext.cpp     | 1931 -----------------
 gfx/skia/src/ports/SkFontHost_none.cpp             |   47 +-
 gfx/skia/src/ports/SkFontHost_sandbox_none.cpp     |   14 -
 gfx/skia/src/ports/SkFontHost_simple.cpp           |  645 ------
 gfx/skia/src/ports/SkFontHost_tables.cpp           |  206 --
 gfx/skia/src/ports/SkFontHost_win.cpp              |  559 +++--
 gfx/skia/src/ports/SkFontHost_win_dw.cpp           |  178 +-
 .../src/ports/SkGlobalInitialization_default.cpp   |   26 +-
 gfx/skia/src/ports/SkHarfBuzzFont.cpp              |    7 +-
 gfx/skia/src/ports/SkImageDecoder_CG.cpp           |   42 +-
 gfx/skia/src/ports/SkImageDecoder_WIC.cpp          |   35 +-
 gfx/skia/src/ports/SkImageDecoder_empty.cpp        |  106 +-
 gfx/skia/src/ports/SkImageRef_ashmem.cpp           |  235 ---
 gfx/skia/src/ports/SkImageRef_ashmem.h             |   47 -
 gfx/skia/src/ports/SkMemory_malloc.cpp             |    1 -
 gfx/skia/src/ports/SkMemory_mozalloc.cpp           |    1 -
 gfx/skia/src/ports/SkOSFile_stdio.cpp              |   64 +-
 .../src/ports/SkPurgeableMemoryBlock_android.cpp   |  110 +
 gfx/skia/src/ports/SkPurgeableMemoryBlock_mac.cpp  |  104 +
 gfx/skia/src/ports/SkPurgeableMemoryBlock_none.cpp |   40 +
 gfx/skia/src/ports/SkThread_pthread.cpp            |    1 -
 gfx/skia/src/ports/SkThread_win.cpp                |   41 +
 gfx/skia/src/ports/SkXMLParser_expat.cpp           |    3 +-
 gfx/skia/src/ports/SkXMLParser_tinyxml.cpp         |    3 +-
 gfx/skia/src/ports/SkXMLPullParser_expat.cpp       |    3 +-
 gfx/skia/src/sfnt/SkOTTableTypes.h                 |   10 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2.h                 |    2 +
 gfx/skia/src/sfnt/SkOTTable_OS_2_V0.h              |    6 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2_V1.h              |    3 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2_V2.h              |    3 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2_V3.h              |    3 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2_V4.h              |    3 +-
 gfx/skia/src/sfnt/SkOTTable_OS_2_VA.h              |    6 +-
 gfx/skia/src/sfnt/SkOTTable_glyf.h                 |  214 ++
 gfx/skia/src/sfnt/SkOTTable_loca.h                 |   31 +
 gfx/skia/src/sfnt/SkOTTable_maxp.h                 |   34 +
 gfx/skia/src/sfnt/SkOTTable_maxp_CFF.h             |   30 +
 gfx/skia/src/sfnt/SkOTTable_maxp_TT.h              |   49 +
 gfx/skia/src/sfnt/SkOTTable_name.cpp               |  530 +++++
 gfx/skia/src/sfnt/SkOTTable_name.h                 | 1008 ++++-----
 gfx/skia/src/sfnt/SkOTUtils.cpp                    |   49 +-
 gfx/skia/src/sfnt/SkOTUtils.h                      |    4 +-
 gfx/skia/src/sfnt/SkSFNTHeader.h                   |   14 +-
 gfx/skia/src/svg/SkSVGElements.cpp                 |    2 -
 gfx/skia/src/svg/SkSVGFilter.h                     |    1 -
 gfx/skia/src/svg/SkSVGGradient.cpp                 |    1 -
 gfx/skia/src/svg/SkSVGPaintState.cpp               |    1 -
 gfx/skia/src/text/SkTextLayout.cpp                 |    1 -
 gfx/skia/src/utils/SkBase64.cpp                    |    2 -
 gfx/skia/src/utils/SkBitSet.cpp                    |    2 +-
 gfx/skia/src/utils/SkBitSet.h                      |    2 +-
 gfx/skia/src/utils/SkBitmapChecksummer.cpp         |   69 +
 gfx/skia/src/utils/SkBitmapChecksummer.h           |   37 +
 gfx/skia/src/utils/SkBitmapTransformer.cpp         |   87 +
 gfx/skia/src/utils/SkBitmapTransformer.h           |  104 +
 gfx/skia/src/utils/SkBoundaryPatch.cpp             |    1 -
 gfx/skia/src/utils/SkCamera.cpp                    |    9 +-
 gfx/skia/src/utils/SkCityHash.cpp                  |   23 +
 gfx/skia/src/utils/SkCityHash.h                    |   47 +
 gfx/skia/src/utils/SkCondVar.cpp                   |   68 +
 gfx/skia/src/utils/SkCountdown.cpp                 |   32 +
 gfx/skia/src/utils/SkCubicInterval.cpp             |    1 -
 gfx/skia/src/utils/SkCullPoints.cpp                |    1 -
 gfx/skia/src/utils/SkDebugTrace.h                  |    2 -
 gfx/skia/src/utils/SkDeferredCanvas.cpp            |  357 ++--
 gfx/skia/src/utils/SkDumpCanvas.cpp                |  121 +-
 gfx/skia/src/utils/SkInterpolator.cpp              |    3 +-
 gfx/skia/src/utils/SkJSON.cpp                      |    3 -
 gfx/skia/src/utils/SkLayer.cpp                     |    1 -
 gfx/skia/src/utils/SkMD5.cpp                       |  252 +++
 gfx/skia/src/utils/SkMD5.h                         |   53 +
 gfx/skia/src/utils/SkMatrix44.cpp                  |  693 +++++--
 gfx/skia/src/utils/SkMeshUtils.cpp                 |    1 -
 gfx/skia/src/utils/SkNWayCanvas.cpp                |   35 +-
 gfx/skia/src/utils/SkOSFile.cpp                    |    3 +-
 gfx/skia/src/utils/SkParseColor.cpp                |    1 -
 gfx/skia/src/utils/SkParsePath.cpp                 |    1 -
 gfx/skia/src/utils/SkPictureUtils.cpp              |  225 ++
 gfx/skia/src/utils/SkProxyCanvas.cpp               |   17 +-
 gfx/skia/src/utils/SkRTConf.cpp                    |  295 +++
 gfx/skia/src/utils/SkSHA1.cpp                      |  268 +++
 gfx/skia/src/utils/SkSHA1.h                        |   53 +
 gfx/skia/src/utils/SkThreadPool.cpp                |   88 +
 gfx/skia/src/utils/SkUnitMappers.cpp               |    3 -
 gfx/skia/src/utils/android/ashmem.cpp              |   87 +
 gfx/skia/src/utils/android/ashmem.h                |   44 +
 gfx/skia/src/utils/cityhash/README                 |    2 +
 gfx/skia/src/utils/cityhash/config.h               |   17 +
 gfx/skia/src/utils/ios/SkFontHost_iOS.mm           |    2 +-
 gfx/skia/src/utils/mac/SkBitmap_Mac.cpp            |    4 +-
 gfx/skia/src/utils/mac/SkCreateCGImageRef.cpp      |   31 +-
 gfx/skia/src/utils/mac/SkStream_mac.cpp            |   12 +-
 gfx/skia/src/utils/win/SkWGL_win.cpp               |  113 +-
 gfx/skia/src/views/SkBGViewArtist.cpp              |    1 -
 gfx/skia/src/views/SkEvent.cpp                     |    1 -
 gfx/skia/src/views/SkParsePaint.cpp                |    1 -
 gfx/skia/src/views/SkProgressView.cpp              |    1 -
 gfx/skia/src/views/SkStackViewLayout.cpp           |    1 -
 gfx/skia/src/views/SkTagList.cpp                   |    1 -
 gfx/skia/src/views/SkTextBox.cpp                   |    1 -
 gfx/skia/src/views/SkTouchGesture.cpp              |    2 -
 gfx/skia/src/views/SkView.cpp                      |   22 +-
 gfx/skia/src/views/SkViewInflate.cpp               |    1 -
 gfx/skia/src/views/SkViewPriv.cpp                  |    5 +-
 gfx/skia/src/views/SkViewPriv.h                    |    1 -
 gfx/skia/src/views/SkWidget.cpp                    |  330 ---
 gfx/skia/src/views/SkWidgets.cpp                   |    3 +-
 gfx/skia/src/views/SkWindow.cpp                    |   33 +-
 gfx/skia/src/views/animated/SkImageView.cpp        |    1 -
 gfx/skia/src/views/animated/SkListView.cpp         |  902 --------
 gfx/skia/src/views/animated/SkListWidget.cpp       |  630 ------
 gfx/skia/src/views/animated/SkScrollBarView.cpp    |    5 +-
 gfx/skia/src/views/animated/SkStaticTextView.cpp   |   19 +-
 gfx/skia/src/views/animated/SkWidgetViews.cpp      |   12 +-
 gfx/skia/src/views/ios/SkOSWindow_iOS.mm           |   10 +-
 gfx/skia/src/views/mac/SkNSView.h                  |    2 +-
 gfx/skia/src/views/mac/SkNSView.mm                 |   61 +-
 gfx/skia/src/views/mac/SkOSWindow_Mac.cpp          |    4 +-
 gfx/skia/src/views/mac/SkOSWindow_Mac.mm           |   12 +-
 gfx/skia/src/views/mac/SkOptionsTableView.mm       |    9 +-
 gfx/skia/src/views/sdl/SkOSWindow_SDL.cpp          |    1 -
 gfx/skia/src/views/unix/SkOSWindow_Unix.cpp        |   62 +-
 gfx/skia/src/views/win/SkOSWindow_win.cpp          |  163 +-
 gfx/skia/src/views/win/skia_win.cpp                |   16 +-
 gfx/skia/src/xml/SkBML_XMLParser.cpp               |    5 +-
 gfx/skia/src/xml/SkDOM.cpp                         |    1 -
 gfx/skia/src/xml/SkJS.cpp                          |    3 +-
 gfx/skia/src/xml/SkXMLPullParser.cpp               |    1 -
 gfx/skia/src/xml/SkXMLWriter.cpp                   |    1 -
 1021 files changed, 50545 insertions(+), 34695 deletions(-)
 create mode 100644 gfx/skia/include/core/SkDeviceProperties.h
 create mode 100644 gfx/skia/include/core/SkFontLCDConfig.h
 create mode 100644 gfx/skia/include/core/SkImageTypes.h
 delete mode 100644 gfx/skia/include/core/SkMMapStream.h
 create mode 100644 gfx/skia/include/core/SkRRect.h
 delete mode 100644 gfx/skia/include/core/SkRandom.h
 create mode 100644 gfx/skia/include/core/SkStringUtils.h
 create mode 100644 gfx/skia/include/core/SkStrokeRec.h
 delete mode 100644 gfx/skia/include/core/SkTDLinkedList.h
 create mode 100644 gfx/skia/include/core/SkTInternalLList.h
 create mode 100644 gfx/skia/include/core/SkTileGridPicture.h
 create mode 100644 gfx/skia/include/effects/SkBicubicImageFilter.h
 create mode 100644 gfx/skia/include/effects/SkDisplacementMapEffect.h
 create mode 100644 gfx/skia/include/effects/SkImageFilterUtils.h
 create mode 100644 gfx/skia/include/effects/SkMatrixConvolutionImageFilter.h
 create mode 100755 gfx/skia/include/effects/SkMergeImageFilter.h
 create mode 100644 gfx/skia/include/effects/SkOffsetImageFilter.h
 create mode 100644 gfx/skia/include/effects/SkRectShaderImageFilter.h
 delete mode 100644 gfx/skia/include/effects/SkSingleInputImageFilter.h
 create mode 100644 gfx/skia/include/gpu/GrBackendEffectFactory.h
 delete mode 100644 gfx/skia/include/gpu/GrCacheID.h
 delete mode 100644 gfx/skia/include/gpu/GrCustomStage.h
 delete mode 100644 gfx/skia/include/gpu/GrCustomStageUnitTest.h
 create mode 100644 gfx/skia/include/gpu/GrDrawEffect.h
 create mode 100644 gfx/skia/include/gpu/GrEffect.h
 create mode 100644 gfx/skia/include/gpu/GrEffectStage.h
 create mode 100644 gfx/skia/include/gpu/GrEffectUnitTest.h
 delete mode 100644 gfx/skia/include/gpu/GrInstanceCounter.h
 delete mode 100644 gfx/skia/include/gpu/GrMatrix.h
 create mode 100644 gfx/skia/include/gpu/GrOvalRenderer.h
 create mode 100644 gfx/skia/include/gpu/GrPathRendererChain.h
 delete mode 100644 gfx/skia/include/gpu/GrProgramStageFactory.h
 delete mode 100644 gfx/skia/include/gpu/GrSamplerState.h
 delete mode 100644 gfx/skia/include/gpu/GrScalar.h
 create mode 100644 gfx/skia/include/gpu/GrTBackendEffectFactory.h
 create mode 100644 gfx/skia/include/gpu/GrTypesPriv.h
 delete mode 100644 gfx/skia/include/gpu/SkGpuCanvas.h
 create mode 100644 gfx/skia/include/gpu/gl/GrGLExtensions.h
 delete mode 100644 gfx/skia/include/gpu/gl/SkGLContext.h
 create mode 100644 gfx/skia/include/gpu/gl/SkGLContextHelper.h
 create mode 100644 gfx/skia/include/images/SkBitmapRegionDecoder.h
 delete mode 100644 gfx/skia/include/images/SkFlipPixelRef.h
 create mode 100644 gfx/skia/include/images/SkImages.h
 delete mode 100644 gfx/skia/include/images/SkJpegUtility.h
 create mode 100644 gfx/skia/include/lazy/SkBitmapFactory.h
 create mode 100644 gfx/skia/include/lazy/SkImageCache.h
 create mode 100644 gfx/skia/include/lazy/SkLruImageCache.h
 create mode 100644 gfx/skia/include/lazy/SkPurgeableImageCache.h
 create mode 100644 gfx/skia/include/ports/SkFontConfigInterface.h
 create mode 100644 gfx/skia/include/ports/SkFontMgr.h
 create mode 100644 gfx/skia/include/ports/SkFontStyle.h
 delete mode 100644 gfx/skia/include/ports/SkStream_Win.h
 create mode 100644 gfx/skia/include/utils/SkCondVar.h
 create mode 100644 gfx/skia/include/utils/SkCountdown.h
 create mode 100644 gfx/skia/include/utils/SkDebugUtils.h
 create mode 100644 gfx/skia/include/utils/SkPictureUtils.h
 create mode 100644 gfx/skia/include/utils/SkRTConf.h
 create mode 100644 gfx/skia/include/utils/SkRandom.h
 create mode 100644 gfx/skia/include/utils/SkRunnable.h
 create mode 100644 gfx/skia/include/utils/SkThreadPool.h
 create mode 100644 gfx/skia/include/views/SkOSWindow_NaCl.h
 delete mode 100644 gfx/skia/include/views/SkOSWindow_wxwidgets.h
 delete mode 100644 gfx/skia/src/core/SkConcaveToTriangles.cpp
 delete mode 100644 gfx/skia/src/core/SkConcaveToTriangles.h
 create mode 100644 gfx/skia/src/core/SkDeviceImageFilterProxy.h
 create mode 100644 gfx/skia/src/core/SkFDStream.cpp
 create mode 100644 gfx/skia/src/core/SkFontDescriptor.cpp
 create mode 100644 gfx/skia/src/core/SkFontDescriptor.h
 create mode 100644 gfx/skia/src/core/SkFontStream.cpp
 create mode 100644 gfx/skia/src/core/SkFontStream.h
 delete mode 100644 gfx/skia/src/core/SkMMapStream.cpp
 create mode 100644 gfx/skia/src/core/SkMatrixUtils.h
 create mode 100644 gfx/skia/src/core/SkPaintPriv.cpp
 create mode 100644 gfx/skia/src/core/SkPaintPriv.h
 create mode 100644 gfx/skia/src/core/SkRRect.cpp
 create mode 100644 gfx/skia/src/core/SkStringUtils.cpp
 create mode 100644 gfx/skia/src/core/SkStrokeRec.cpp
 create mode 100644 gfx/skia/src/core/SkTLList.h
 create mode 100644 gfx/skia/src/core/SkTileGrid.cpp
 create mode 100644 gfx/skia/src/core/SkTileGrid.h
 create mode 100644 gfx/skia/src/core/SkTileGridPicture.cpp
 create mode 100644 gfx/skia/src/core/SkTypefacePriv.h
 create mode 100644 gfx/skia/src/effects/SkBicubicImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkDisplacementMapEffect.cpp
 create mode 100644 gfx/skia/src/effects/SkImageFilterUtils.cpp
 create mode 100644 gfx/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
 create mode 100755 gfx/skia/src/effects/SkMergeImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkOffsetImageFilter.cpp
 create mode 100644 gfx/skia/src/effects/SkRectShaderImageFilter.cpp
 delete mode 100644 gfx/skia/src/effects/SkRectShape.cpp
 delete mode 100644 gfx/skia/src/effects/SkSingleInputImageFilter.cpp
 delete mode 100644 gfx/skia/src/gpu/GrCustomStage.cpp
 create mode 100644 gfx/skia/src/gpu/GrDrawState.cpp
 create mode 100644 gfx/skia/src/gpu/GrDrawTargetCaps.h
 create mode 100644 gfx/skia/src/gpu/GrEffect.cpp
 delete mode 100644 gfx/skia/src/gpu/GrGpuVertex.h
 delete mode 100644 gfx/skia/src/gpu/GrMatrix.cpp
 create mode 100644 gfx/skia/src/gpu/GrOvalRenderer.cpp
 delete mode 100644 gfx/skia/src/gpu/GrPathRendererChain.h
 delete mode 100644 gfx/skia/src/gpu/GrRandom.h
 create mode 100644 gfx/skia/src/gpu/GrReducedClip.cpp
 create mode 100644 gfx/skia/src/gpu/GrReducedClip.h
 delete mode 100644 gfx/skia/src/gpu/GrTDArray.h
 delete mode 100644 gfx/skia/src/gpu/GrTLList.h
 delete mode 100644 gfx/skia/src/gpu/SkGpuCanvas.cpp
 delete mode 100644 gfx/skia/src/gpu/android/GrGLCreateNativeInterface_android.cpp
 delete mode 100644 gfx/skia/src/gpu/android/SkNativeGLContext_android.cpp
 delete mode 100644 gfx/skia/src/gpu/app-android.cpp
 delete mode 100644 gfx/skia/src/gpu/effects/GrColorTableEffect.cpp
 delete mode 100644 gfx/skia/src/gpu/effects/GrColorTableEffect.h
 create mode 100644 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
 create mode 100644 gfx/skia/src/gpu/effects/GrSimpleTextureEffect.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLBufferImpl.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLBufferImpl.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLContext.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLContext.h
 delete mode 100644 gfx/skia/src/gpu/gl/GrGLContextInfo.cpp
 delete mode 100644 gfx/skia/src/gpu/gl/GrGLContextInfo.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLEffect.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLEffect.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLEffectMatrix.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLEffectMatrix.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLExtensions.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLNoOpInterface.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLNoOpInterface.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLProgramDesc.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLProgramDesc.h
 delete mode 100644 gfx/skia/src/gpu/gl/GrGLProgramStage.cpp
 delete mode 100644 gfx/skia/src/gpu/gl/GrGLProgramStage.h
 create mode 100644 gfx/skia/src/gpu/gl/GrGLVertexArray.cpp
 create mode 100644 gfx/skia/src/gpu/gl/GrGLVertexArray.h
 delete mode 100644 gfx/skia/src/gpu/gl/SkGLContext.cpp
 create mode 100644 gfx/skia/src/gpu/gl/SkGLContextHelper.cpp
 create mode 100644 gfx/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
 create mode 100644 gfx/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
 create mode 100644 gfx/skia/src/gpu/gl/debug/GrVertexArrayObj.h
 create mode 100644 gfx/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
 create mode 100644 gfx/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
 create mode 100644 gfx/skia/src/gpu/gl/mesa/osmesa_wrapper.h
 create mode 100644 gfx/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
 delete mode 100644 gfx/skia/src/gpu/gr_hello_world.cpp
 delete mode 100644 gfx/skia/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
 create mode 100644 gfx/skia/src/images/SkBitmapRegionDecoder.cpp
 delete mode 100644 gfx/skia/src/images/SkFDStream.cpp
 delete mode 100644 gfx/skia/src/images/SkFlipPixelRef.cpp
 create mode 100644 gfx/skia/src/images/SkImageDecoder_libwebp.cpp
 create mode 100644 gfx/skia/src/images/SkImageRef_ashmem.cpp
 create mode 100644 gfx/skia/src/images/SkImageRef_ashmem.h
 create mode 100644 gfx/skia/src/images/SkImages.cpp
 create mode 100644 gfx/skia/src/images/SkJpegUtility.h
 create mode 100644 gfx/skia/src/images/transform_scanline.h
 create mode 100644 gfx/skia/src/lazy/SkBitmapFactory.cpp
 create mode 100644 gfx/skia/src/lazy/SkLazyPixelRef.cpp
 create mode 100644 gfx/skia/src/lazy/SkLazyPixelRef.h
 create mode 100644 gfx/skia/src/lazy/SkLruImageCache.cpp
 create mode 100644 gfx/skia/src/lazy/SkPurgeableImageCache.cpp
 create mode 100644 gfx/skia/src/lazy/SkPurgeableMemoryBlock.h
 create mode 100644 gfx/skia/src/lazy/SkPurgeableMemoryBlock_common.cpp
 create mode 100644 gfx/skia/src/pdf/SkTSet.h
 create mode 100644 gfx/skia/src/ports/SkDebug_nacl.cpp
 create mode 100644 gfx/skia/src/ports/SkFontConfigInterface_direct.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontDescriptor.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontDescriptor.h
 delete mode 100644 gfx/skia/src/ports/SkFontHost_FONTPATH.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_android_old.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_ascender.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_freetype_mac.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_mac_atsui.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_simple.cpp
 delete mode 100644 gfx/skia/src/ports/SkFontHost_tables.cpp
 delete mode 100644 gfx/skia/src/ports/SkImageRef_ashmem.cpp
 delete mode 100644 gfx/skia/src/ports/SkImageRef_ashmem.h
 create mode 100644 gfx/skia/src/ports/SkPurgeableMemoryBlock_android.cpp
 create mode 100644 gfx/skia/src/ports/SkPurgeableMemoryBlock_mac.cpp
 create mode 100644 gfx/skia/src/ports/SkPurgeableMemoryBlock_none.cpp
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_glyf.h
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_loca.h
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_maxp.h
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_maxp_CFF.h
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_maxp_TT.h
 create mode 100644 gfx/skia/src/sfnt/SkOTTable_name.cpp
 create mode 100644 gfx/skia/src/utils/SkBitmapChecksummer.cpp
 create mode 100644 gfx/skia/src/utils/SkBitmapChecksummer.h
 create mode 100644 gfx/skia/src/utils/SkBitmapTransformer.cpp
 create mode 100644 gfx/skia/src/utils/SkBitmapTransformer.h
 create mode 100644 gfx/skia/src/utils/SkCityHash.cpp
 create mode 100644 gfx/skia/src/utils/SkCityHash.h
 create mode 100644 gfx/skia/src/utils/SkCondVar.cpp
 create mode 100644 gfx/skia/src/utils/SkCountdown.cpp
 create mode 100644 gfx/skia/src/utils/SkMD5.cpp
 create mode 100644 gfx/skia/src/utils/SkMD5.h
 create mode 100644 gfx/skia/src/utils/SkPictureUtils.cpp
 create mode 100644 gfx/skia/src/utils/SkRTConf.cpp
 create mode 100644 gfx/skia/src/utils/SkSHA1.cpp
 create mode 100644 gfx/skia/src/utils/SkSHA1.h
 create mode 100644 gfx/skia/src/utils/SkThreadPool.cpp
 create mode 100644 gfx/skia/src/utils/android/ashmem.cpp
 create mode 100644 gfx/skia/src/utils/android/ashmem.h
 create mode 100644 gfx/skia/src/utils/cityhash/README
 create mode 100644 gfx/skia/src/utils/cityhash/config.h
 delete mode 100644 gfx/skia/src/views/SkWidget.cpp
 delete mode 100644 gfx/skia/src/views/animated/SkListView.cpp
 delete mode 100644 gfx/skia/src/views/animated/SkListWidget.cpp
[PATCH 02/13] Bug 848491 - Re-apply Bug 795549 - Move TileProc

From e70225b200fcbb7f4226d9cb14d3d85b7eee9dd6 Mon Sep 17 00:00:00 2001
 functions into their own file to ensure they only
 exist once in a library
---
 .../src/effects/gradients/SkGradientShaderPriv.h   | 31 +++-------------------
 1 file changed, 3 insertions(+), 28 deletions(-)
[PATCH 03/13] Bug 848491 - Update DrawTarget and gfxPlatform to use

From 7abdab17dca444cad95bb5236e2aaf3cdc19844a Mon Sep 17 00:00:00 2001
 the new Skia APIs
---
 gfx/2d/DrawTargetSkia.cpp  |  5 +++--
 gfx/2d/HelpersSkia.h       | 19 +++++++++++++++++--
 gfx/thebes/gfxPlatform.cpp |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)
[PATCH 04/13] Bug 848491 - Update skia-npapi to use new Skia APIs

From 6fc529d46e2461cc3e63258d894b0cb86cb34506 Mon Sep 17 00:00:00 2001
---
 other-licenses/skia-npapi/ANPTypeface.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
[PATCH 05/13] Bug 736276 - Add a new SkFontHost that takes a

From 4b1f3cc8d3dc9fb72fbb33a6db1949b127cb1b9d Mon Sep 17 00:00:00 2001
 cairo_scaled_font_t
---
 gfx/skia/Makefile.in                      |   6 +-
 gfx/skia/include/ports/SkTypeface_cairo.h |  11 +
 gfx/skia/moz.build                        |  19 +-
 gfx/skia/src/ports/SkFontHost_cairo.cpp   | 364 ++++++++++++++++++++++++++++++
 4 files changed, 390 insertions(+), 10 deletions(-)
 create mode 100644 gfx/skia/include/ports/SkTypeface_cairo.h
 create mode 100644 gfx/skia/src/ports/SkFontHost_cairo.cpp
[PATCH 06/13] Bug 848491 - Re-apply Bug 777614 - Add our

From 318c803f43a8b872cbb9436182b802fac1fe00ac Mon Sep 17 00:00:00 2001
 SkUserConfig.h
---
 gfx/skia/include/config/SkUserConfig.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
[PATCH 07/13] Bug 848491 - Re-apply bug 687188 - Expand the gradient

From 3075e2b320ca5db58d8f33b95758f91258b1bbb4 Mon Sep 17 00:00:00 2001
 cache by 2 to store 0/1 colour stop values for
 clamping.
---
 .../src/effects/gradients/SkGradientShader.cpp     | 22 +++++++++++++++++-----
 .../src/effects/gradients/SkGradientShaderPriv.h   |  3 +++
 .../src/effects/gradients/SkLinearGradient.cpp     | 21 +++++++++++++--------
 .../gradients/SkTwoPointConicalGradient.cpp        | 12 ++++++++----
 .../effects/gradients/SkTwoPointRadialGradient.cpp | 11 ++++++++---
 5 files changed, 49 insertions(+), 20 deletions(-)
[PATCH 08/13] Bug 848491 - Re-apply 759683 - Handle compilers that

From fd3027797fa99bb9327c4914c4a837b8833d2b81 Mon Sep 17 00:00:00 2001
 don't support SSSE3 intrinsics
---
 gfx/skia/src/opts/opts_check_SSE2.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
[PATCH 09/13] Bug 848491 - Re-apply bug 751418 - Add our own

From ff986f56ebb2250f3df8fcf06bdd3bfb52a7c3ac Mon Sep 17 00:00:00 2001
 GrUserConfig
---
 gfx/skia/include/gpu/GrUserConfig.h | 4 ++++
 1 file changed, 4 insertions(+)
[PATCH 10/13] Bug 848491 - Re-apply bug 817356 - Patch Skia to

From cb261d59b3f72f97cb27e77376a20d37eb3ceb9c Mon Sep 17 00:00:00 2001
 recognize uppercase PPC/PPC64.
---
 gfx/skia/include/core/SkPreConfig.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH 11/13] Bug 875218 - Ensure the GrContext's lifetime is

From 76c821bb52f586f860423125ae4fe2ce29a96f34 Mon Sep 17 00:00:00 2001
 managed properly by DrawTargetSkia
---
 gfx/2d/2D.h                |  2 +-
 gfx/2d/DrawTargetSkia.cpp  |  5 +++--
 gfx/2d/DrawTargetSkia.h    |  6 +++++-
 gfx/2d/Factory.cpp         |  2 +-
 gfx/thebes/gfxPlatform.cpp | 17 +++++++----------
 5 files changed, 17 insertions(+), 15 deletions(-)
[PATCH 12/13] Bug 736276 - Rename ScaledFontFreeType to

From 0a53b974226807f3a9b84c28ba549908efeeecf2 Mon Sep 17 00:00:00 2001
 ScaledFontCairo, and use Skia's API to create an
 SkTypeface from a cairo_scaled_font_t r=jrmuizel
---
 gfx/2d/2D.h                       |  5 ++++
 gfx/2d/DrawTargetSkia.cpp         | 28 +++++++++++++++++--
 gfx/2d/Factory.cpp                | 32 +++++++++++----------
 gfx/2d/Makefile.in                |  1 +
 gfx/2d/ScaledFontBase.cpp         |  6 ++--
 gfx/2d/ScaledFontBase.h           | 11 ++++++--
 gfx/2d/ScaledFontCairo.cpp        | 59 +++++++++++++++++++++++++++++++++++++++
 gfx/2d/ScaledFontCairo.h          | 50 +++++++++++++++++++++++++++++++++
 gfx/2d/ScaledFontFreetype.cpp     | 53 -----------------------------------
 gfx/2d/ScaledFontFreetype.h       | 24 ----------------
 gfx/2d/Types.h                    |  8 ++++++
 gfx/2d/moz.build                  |  6 +---
 gfx/thebes/gfxAndroidPlatform.cpp | 13 ++++-----
 gfx/thebes/gfxFT2Fonts.cpp        | 19 +++++++++++++
 gfx/thebes/gfxFT2Fonts.h          |  4 +++
 gfx/thebes/gfxPangoFonts.cpp      | 37 ++++++++++++++++++++++++
 gfx/thebes/gfxPlatformGtk.cpp     | 14 +++++-----
 17 files changed, 251 insertions(+), 119 deletions(-)
 create mode 100644 gfx/2d/ScaledFontCairo.cpp
 create mode 100644 gfx/2d/ScaledFontCairo.h
 delete mode 100644 gfx/2d/ScaledFontFreetype.cpp
 delete mode 100644 gfx/2d/ScaledFontFreetype.h
[PATCH 13/13] Enable Skia/GPU by default

From 1b91f884bf5204d8562ea3aae3853887a5e78e00 Mon Sep 17 00:00:00 2001
---
 modules/libpref/src/init/all.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH] Bug 869178 - Use SkCanvas::drawBitmapRect instead of a

From 2bac316a449ca3baea590e2beebc4a34b7e9a47d Mon Sep 17 00:00:00 2001
 bitmap SkShader; it's slightly faster r=snorp
---
 gfx/2d/DrawTargetSkia.cpp                 | 35 ++++++++++++++++++++++++-------
 layout/reftests/svg/as-image/reftest.list |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)
Fix a memory leak in GLContextProviderGLX: was not destroying pixmaps used for offscreen contexts
Fix a crash in SourceSurfaceSkia: should have used a RefPtr, not a raw pointer, to the DrawTargetSkia
Add a GenericRefCounted base class to moz2d, will allow moz2d to hold strong references to external objects without adding a dependency
Make GLContext inherit GenericRefCounted, to allow moz2d to have strong references to GLContexts
Refactor the ownership model under DrawTargetSkia, so that DrawTargetSkia now owns a GLContext, and the only reference that the Skia GrGLInterface gets to the non-Skia world is a pointer back to the DrawTargetSkia
Fix build on windows