This CL updates chrome to the latest version of skia, retrieved via DEPS, and

placed in third_party.  All relevant skia changes (for all 3 platforms) have
been upstreamed.

Most of this CL is mind-numbingly repetitive.  Things of interest are:  skia.gyp
(now points at third_party versions), DEPS, and SkUserConfig.h.  stdint.h:  Skia
now requires C99 integer types, which MSVC doesn't support natively.  I have put
typedefs in config/win/stdint.h.

Note that the new version of skia appears to render rects whose coordinates
are "backwards" (ie., x2 < x1 or y2 < y1), which were formerly culled.  There
were a couple obvious instances of this in the code which I fixed, but there may
be more.

There were ~35 layout test failures due to minor pixel differences which I
rebaselined on Windows and Linux, and 8 genuine failures related to masks and
stroked text, which I have put in text_expectations.txt and assigned to
myself.  (There was another change which broke ~1700 tests on each platform,
but I put that change behind an #ifdef for now).

R=brettw

Review URL: http://codereview.chromium.org/65012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 509 insertions, 615 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index 5062420..c84a885 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -13,214 +13,488 @@
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
       'sources': [
         'precompiled.cc',
-        #'animator/SkAnimate.h',
-        #'animator/SkAnimateActive.cpp',
-        #'animator/SkAnimateActive.h',
-        #'animator/SkAnimateBase.cpp',
-        #'animator/SkAnimateBase.h',
-        #'animator/SkAnimateField.cpp',
-        #'animator/SkAnimateMaker.cpp',
-        #'animator/SkAnimateMaker.h',
-        #'animator/SkAnimateProperties.h',
-        #'animator/SkAnimateSet.cpp',
-        #'animator/SkAnimateSet.h',
-        #'animator/SkAnimator.cpp',
-        #'animator/SkAnimatorScript.cpp',
-        #'animator/SkAnimatorScript.h',
-        #'animator/SkAnimatorScript2.cpp',
-        #'animator/SkAnimatorScript2.h',
-        #'animator/SkBase64.cpp',
-        #'animator/SkBase64.h',
-        #'animator/SkBoundable.cpp',
-        #'animator/SkBoundable.h',
-        #'animator/SkBuildCondensedInfo.cpp',
-        #'animator/SkCondensedDebug.cpp',
-        #'animator/SkCondensedRelease.cpp',
-        #'animator/SkDisplayable.cpp',
-        #'animator/SkDisplayable.h',
-        #'animator/SkDisplayAdd.cpp',
-        #'animator/SkDisplayAdd.h',
-        #'animator/SkDisplayApply.cpp',
-        #'animator/SkDisplayApply.h',
-        #'animator/SkDisplayBounds.cpp',
-        #'animator/SkDisplayBounds.h',
-        #'animator/SkDisplayEvent.cpp',
-        #'animator/SkDisplayEvent.h',
-        #'animator/SkDisplayEvents.cpp',
-        #'animator/SkDisplayEvents.h',
-        #'animator/SkDisplayInclude.cpp',
-        #'animator/SkDisplayInclude.h',
-        #'animator/SkDisplayInput.cpp',
-        #'animator/SkDisplayInput.h',
-        #'animator/SkDisplayList.cpp',
-        #'animator/SkDisplayList.h',
-        #'animator/SkDisplayMath.cpp',
-        #'animator/SkDisplayMath.h',
-        #'animator/SkDisplayMovie.cpp',
-        #'animator/SkDisplayMovie.h',
-        #'animator/SkDisplayNumber.cpp',
-        #'animator/SkDisplayNumber.h',
-        #'animator/SkDisplayPost.cpp',
-        #'animator/SkDisplayPost.h',
-        #'animator/SkDisplayRandom.cpp',
-        #'animator/SkDisplayRandom.h',
-        #'animator/SkDisplayScreenplay.cpp',
-        #'animator/SkDisplayScreenplay.h',
-        #'animator/SkDisplayType.cpp',
-        #'animator/SkDisplayType.h',
-        #'animator/SkDisplayTypes.cpp',
-        #'animator/SkDisplayTypes.h',
-        #'animator/SkDisplayXMLParser.cpp',
-        #'animator/SkDisplayXMLParser.h',
-        #'animator/SkDraw3D.cpp',
-        #'animator/SkDraw3D.h',
-        #'animator/SkDrawable.cpp',
-        #'animator/SkDrawable.h',
-        #'animator/SkDrawBitmap.cpp',
-        #'animator/SkDrawBitmap.h',
-        #'animator/SkDrawBlur.cpp',
-        #'animator/SkDrawBlur.h',
-        #'animator/SkDrawClip.cpp',
-        #'animator/SkDrawClip.h',
-        #'animator/SkDrawColor.cpp',
-        #'animator/SkDrawColor.h',
-        #'animator/SkDrawDash.cpp',
-        #'animator/SkDrawDash.h',
-        #'animator/SkDrawDiscrete.cpp',
-        #'animator/SkDrawDiscrete.h',
-        #'animator/SkDrawEmboss.cpp',
-        #'animator/SkDrawEmboss.h',
-        #'animator/SkDrawExtraPathEffect.cpp',
-        #'animator/SkDrawFull.cpp',
-        #'animator/SkDrawFull.h',
-        #'animator/SkDrawGradient.cpp',
-        #'animator/SkDrawGradient.h',
-        #'animator/SkDrawGroup.cpp',
-        #'animator/SkDrawGroup.h',
-        #'animator/SkDrawLine.cpp',
-        #'animator/SkDrawLine.h',
-        #'animator/SkDrawMatrix.cpp',
-        #'animator/SkDrawMatrix.h',
-        #'animator/SkDrawOval.cpp',
-        #'animator/SkDrawOval.h',
-        #'animator/SkDrawPaint.cpp',
-        #'animator/SkDrawPaint.h',
-        #'animator/SkDrawPath.cpp',
-        #'animator/SkDrawPath.h',
-        #'animator/SkDrawPoint.cpp',
-        #'animator/SkDrawPoint.h',
-        #'animator/SkDrawRectangle.cpp',
-        #'animator/SkDrawRectangle.h',
-        #'animator/SkDrawSaveLayer.cpp',
-        #'animator/SkDrawSaveLayer.h',
-        #'animator/SkDrawShader.cpp',
-        #'animator/SkDrawShader.h',
-        #'animator/SkDrawText.cpp',
-        #'animator/SkDrawText.h',
-        #'animator/SkDrawTextBox.cpp',
-        #'animator/SkDrawTextBox.h',
-        #'animator/SkDrawTo.cpp',
-        #'animator/SkDrawTo.h',
-        #'animator/SkDrawTransparentShader.cpp',
-        #'animator/SkDrawTransparentShader.h',
-        #'animator/SkDump.cpp',
-        #'animator/SkDump.h',
-        #'animator/SkExtras.h',
-        #'animator/SkGetCondensedInfo.cpp',
-        #'animator/SkHitClear.cpp',
-        #'animator/SkHitClear.h',
-        #'animator/SkHitTest.cpp',
-        #'animator/SkHitTest.h',
-        #'animator/SkIntArray.h',
-        #'animator/SkMatrixParts.cpp',
-        #'animator/SkMatrixParts.h',
-        #'animator/SkMemberInfo.cpp',
-        #'animator/SkMemberInfo.h',
-        #'animator/SkOpArray.cpp',
-        #'animator/SkOpArray.h',
-        #'animator/SkOperand.h',
-        #'animator/SkOperand2.h',
-        #'animator/SkOperandInterpolator.h',
-        #'animator/SkOperandIterpolator.cpp',
-        #'animator/SkPaintParts.cpp',
-        #'animator/SkPaintParts.h',
-        #'animator/SkPathParts.cpp',
-        #'animator/SkPathParts.h',
-        #'animator/SkPostParts.cpp',
-        #'animator/SkPostParts.h',
-        #'animator/SkScript.cpp',
-        #'animator/SkScript.h',
-        #'animator/SkScript2.h',
-        #'animator/SkScriptCallBack.h',
-        #'animator/SkScriptDecompile.cpp',
-        #'animator/SkScriptRuntime.cpp',
-        #'animator/SkScriptRuntime.h',
-        #'animator/SkScriptTokenizer.cpp',
-        #'animator/SkSnapshot.cpp',
-        #'animator/SkSnapshot.h',
-        #'animator/SkSVGPath.cpp',
-        #'animator/SkTDArray_Experimental.h',
-        #'animator/SkTextOnPath.cpp',
-        #'animator/SkTextOnPath.h',
-        #'animator/SkTextToPath.cpp',
-        #'animator/SkTextToPath.h',
-        'animator/SkTime.cpp',
-        #'animator/SkTypedArray.cpp',
-        #'animator/SkTypedArray.h',
-        #'animator/SkXMLAnimatorWriter.cpp',
-        #'animator/SkXMLAnimatorWriter.h',
-        'corecg/Sk64.cpp',
-        'corecg/SkBuffer.cpp',
-        'corecg/SkChunkAlloc.cpp',
-        'corecg/SkCordic.cpp',
-        'corecg/SkCordic.h',
-        'corecg/SkDebug.cpp',
-        'corecg/SkDebug_stdio.cpp',
-        'corecg/SkFloat.cpp',
-        'corecg/SkFloat.h',
-        'corecg/SkFloatBits.cpp',
-        'corecg/SkFloatBits.h',
-        'corecg/SkInterpolator.cpp',
-        'corecg/SkMath.cpp',
-        'corecg/SkMatrix.cpp',
-        'corecg/SkMemory_stdlib.cpp',
-        'corecg/SkPageFlipper.cpp',
-        'corecg/SkPoint.cpp',
-        'corecg/SkRect.cpp',
-        'corecg/SkRegion.cpp',
-        'corecg/SkRegionPriv.h',
-        'corecg/SkSinTable.h',
-        'corecg/SkTSort.h',
-        'effects/Sk1DPathEffect.cpp',
-        'effects/Sk2DPathEffect.cpp',
-        'effects/SkAvoidXfermode.cpp',
-        'effects/SkBlurDrawLooper.cpp',
-        'effects/SkBlurMask.cpp',
-        'effects/SkBlurMask.h',
-        'effects/SkBlurMaskFilter.cpp',
-        'effects/SkCamera.cpp',
-        'effects/SkColorFilters.cpp',
-        'effects/SkColorMatrix.cpp',
-        'effects/SkColorMatrixFilter.cpp',
-        'effects/SkCornerPathEffect.cpp',
-        'effects/SkCullPoints.cpp',
-        'effects/SkDashPathEffect.cpp',
-        'effects/SkDiscretePathEffect.cpp',
-        'effects/SkEmbossMask.cpp',
-        'effects/SkEmbossMask.h',
-        'effects/SkEmbossMask_Table.h',
-        'effects/SkEmbossMaskFilter.cpp',
-        'effects/SkGradientShader.cpp',
-        'effects/SkKernel33MaskFilter.cpp',
-        #'effects/SkLayerDrawLooper.cpp',
-        'effects/SkLayerRasterizer.cpp',
-        #'effects/SkNinePatch.cpp',
-        'effects/SkPaintFlagsDrawFilter.cpp',
-        'effects/SkPixelXorXfermode.cpp',
-        'effects/SkRadialGradient_Table.h',
-        'effects/SkShaderExtras.cpp',
-        'effects/SkTransparentShader.cpp',
-        'effects/SkUnitMappers.cpp',
+        #'../third_party/skia/src/animator/SkAnimate.h',
+        #'../third_party/skia/src/animator/SkAnimateActive.cpp',
+        #'../third_party/skia/src/animator/SkAnimateActive.h',
+        #'../third_party/skia/src/animator/SkAnimateBase.cpp',
+        #'../third_party/skia/src/animator/SkAnimateBase.h',
+        #'../third_party/skia/src/animator/SkAnimateField.cpp',
+        #'../third_party/skia/src/animator/SkAnimateMaker.cpp',
+        #'../third_party/skia/src/animator/SkAnimateMaker.h',
+        #'../third_party/skia/src/animator/SkAnimateProperties.h',
+        #'../third_party/skia/src/animator/SkAnimateSchema.xsd',
+        #'../third_party/skia/src/animator/SkAnimateSchema.xsx',
+        #'../third_party/skia/src/animator/SkAnimateSet.cpp',
+        #'../third_party/skia/src/animator/SkAnimateSet.h',
+        #'../third_party/skia/src/animator/SkAnimator.cpp',
+        #'../third_party/skia/src/animator/SkAnimatorScript.cpp',
+        #'../third_party/skia/src/animator/SkAnimatorScript.h',
+        #'../third_party/skia/src/animator/SkAnimatorScript2.cpp',
+        #'../third_party/skia/src/animator/SkAnimatorScript2.h',
+        #'../third_party/skia/src/animator/SkBase64.cpp',
+        #'../third_party/skia/src/animator/SkBase64.h',
+        #'../third_party/skia/src/animator/SkBoundable.cpp',
+        #'../third_party/skia/src/animator/SkBoundable.h',
+        #'../third_party/skia/src/animator/SkBuildCondensedInfo.cpp',
+        #'../third_party/skia/src/animator/SkCondensedDebug.cpp',
+        #'../third_party/skia/src/animator/SkCondensedRelease.cpp',
+        #'../third_party/skia/src/animator/SkDisplayAdd.cpp',
+        #'../third_party/skia/src/animator/SkDisplayAdd.h',
+        #'../third_party/skia/src/animator/SkDisplayApply.cpp',
+        #'../third_party/skia/src/animator/SkDisplayApply.h',
+        #'../third_party/skia/src/animator/SkDisplayBounds.cpp',
+        #'../third_party/skia/src/animator/SkDisplayBounds.h',
+        #'../third_party/skia/src/animator/SkDisplayEvent.cpp',
+        #'../third_party/skia/src/animator/SkDisplayEvent.h',
+        #'../third_party/skia/src/animator/SkDisplayEvents.cpp',
+        #'../third_party/skia/src/animator/SkDisplayEvents.h',
+        #'../third_party/skia/src/animator/SkDisplayInclude.cpp',
+        #'../third_party/skia/src/animator/SkDisplayInclude.h',
+        #'../third_party/skia/src/animator/SkDisplayInput.cpp',
+        #'../third_party/skia/src/animator/SkDisplayInput.h',
+        #'../third_party/skia/src/animator/SkDisplayList.cpp',
+        #'../third_party/skia/src/animator/SkDisplayList.h',
+        #'../third_party/skia/src/animator/SkDisplayMath.cpp',
+        #'../third_party/skia/src/animator/SkDisplayMath.h',
+        #'../third_party/skia/src/animator/SkDisplayMovie.cpp',
+        #'../third_party/skia/src/animator/SkDisplayMovie.h',
+        #'../third_party/skia/src/animator/SkDisplayNumber.cpp',
+        #'../third_party/skia/src/animator/SkDisplayNumber.h',
+        #'../third_party/skia/src/animator/SkDisplayPost.cpp',
+        #'../third_party/skia/src/animator/SkDisplayPost.h',
+        #'../third_party/skia/src/animator/SkDisplayRandom.cpp',
+        #'../third_party/skia/src/animator/SkDisplayRandom.h',
+        #'../third_party/skia/src/animator/SkDisplayScreenplay.cpp',
+        #'../third_party/skia/src/animator/SkDisplayScreenplay.h',
+        #'../third_party/skia/src/animator/SkDisplayType.cpp',
+        #'../third_party/skia/src/animator/SkDisplayType.h',
+        #'../third_party/skia/src/animator/SkDisplayTypes.cpp',
+        #'../third_party/skia/src/animator/SkDisplayTypes.h',
+        #'../third_party/skia/src/animator/SkDisplayXMLParser.cpp',
+        #'../third_party/skia/src/animator/SkDisplayXMLParser.h',
+        #'../third_party/skia/src/animator/SkDisplayable.cpp',
+        #'../third_party/skia/src/animator/SkDisplayable.h',
+        #'../third_party/skia/src/animator/SkDraw3D.cpp',
+        #'../third_party/skia/src/animator/SkDraw3D.h',
+        #'../third_party/skia/src/animator/SkDrawBitmap.cpp',
+        #'../third_party/skia/src/animator/SkDrawBitmap.h',
+        #'../third_party/skia/src/animator/SkDrawBlur.cpp',
+        #'../third_party/skia/src/animator/SkDrawBlur.h',
+        #'../third_party/skia/src/animator/SkDrawClip.cpp',
+        #'../third_party/skia/src/animator/SkDrawClip.h',
+        #'../third_party/skia/src/animator/SkDrawColor.cpp',
+        #'../third_party/skia/src/animator/SkDrawColor.h',
+        #'../third_party/skia/src/animator/SkDrawDash.cpp',
+        #'../third_party/skia/src/animator/SkDrawDash.h',
+        #'../third_party/skia/src/animator/SkDrawDiscrete.cpp',
+        #'../third_party/skia/src/animator/SkDrawDiscrete.h',
+        #'../third_party/skia/src/animator/SkDrawEmboss.cpp',
+        #'../third_party/skia/src/animator/SkDrawEmboss.h',
+        #'../third_party/skia/src/animator/SkDrawExtraPathEffect.cpp',
+        #'../third_party/skia/src/animator/SkDrawFull.cpp',
+        #'../third_party/skia/src/animator/SkDrawFull.h',
+        #'../third_party/skia/src/animator/SkDrawGradient.cpp',
+        #'../third_party/skia/src/animator/SkDrawGradient.h',
+        #'../third_party/skia/src/animator/SkDrawGroup.cpp',
+        #'../third_party/skia/src/animator/SkDrawGroup.h',
+        #'../third_party/skia/src/animator/SkDrawLine.cpp',
+        #'../third_party/skia/src/animator/SkDrawLine.h',
+        #'../third_party/skia/src/animator/SkDrawMatrix.cpp',
+        #'../third_party/skia/src/animator/SkDrawMatrix.h',
+        #'../third_party/skia/src/animator/SkDrawOval.cpp',
+        #'../third_party/skia/src/animator/SkDrawOval.h',
+        #'../third_party/skia/src/animator/SkDrawPaint.cpp',
+        #'../third_party/skia/src/animator/SkDrawPaint.h',
+        #'../third_party/skia/src/animator/SkDrawPath.cpp',
+        #'../third_party/skia/src/animator/SkDrawPath.h',
+        #'../third_party/skia/src/animator/SkDrawPoint.cpp',
+        #'../third_party/skia/src/animator/SkDrawPoint.h',
+        #'../third_party/skia/src/animator/SkDrawRectangle.cpp',
+        #'../third_party/skia/src/animator/SkDrawRectangle.h',
+        #'../third_party/skia/src/animator/SkDrawSaveLayer.cpp',
+        #'../third_party/skia/src/animator/SkDrawSaveLayer.h',
+        #'../third_party/skia/src/animator/SkDrawShader.cpp',
+        #'../third_party/skia/src/animator/SkDrawShader.h',
+        #'../third_party/skia/src/animator/SkDrawText.cpp',
+        #'../third_party/skia/src/animator/SkDrawText.h',
+        #'../third_party/skia/src/animator/SkDrawTextBox.cpp',
+        #'../third_party/skia/src/animator/SkDrawTextBox.h',
+        #'../third_party/skia/src/animator/SkDrawTo.cpp',
+        #'../third_party/skia/src/animator/SkDrawTo.h',
+        #'../third_party/skia/src/animator/SkDrawTransparentShader.cpp',
+        #'../third_party/skia/src/animator/SkDrawTransparentShader.h',
+        #'../third_party/skia/src/animator/SkDrawable.cpp',
+        #'../third_party/skia/src/animator/SkDrawable.h',
+        #'../third_party/skia/src/animator/SkDump.cpp',
+        #'../third_party/skia/src/animator/SkDump.h',
+        #'../third_party/skia/src/animator/SkExtraPathEffects.xsd',
+        #'../third_party/skia/src/animator/SkExtras.h',
+        #'../third_party/skia/src/animator/SkGetCondensedInfo.cpp',
+        #'../third_party/skia/src/animator/SkHitClear.cpp',
+        #'../third_party/skia/src/animator/SkHitClear.h',
+        #'../third_party/skia/src/animator/SkHitTest.cpp',
+        #'../third_party/skia/src/animator/SkHitTest.h',
+        #'../third_party/skia/src/animator/SkIntArray.h',
+        #'../third_party/skia/src/animator/SkMatrixParts.cpp',
+        #'../third_party/skia/src/animator/SkMatrixParts.h',
+        #'../third_party/skia/src/animator/SkMemberInfo.cpp',
+        #'../third_party/skia/src/animator/SkMemberInfo.h',
+        #'../third_party/skia/src/animator/SkOpArray.cpp',
+        #'../third_party/skia/src/animator/SkOpArray.h',
+        #'../third_party/skia/src/animator/SkOperand.h',
+        #'../third_party/skia/src/animator/SkOperand2.h',
+        #'../third_party/skia/src/animator/SkOperandInterpolator.h',
+        #'../third_party/skia/src/animator/SkOperandIterpolator.cpp',
+        #'../third_party/skia/src/animator/SkPaintParts.cpp',
+        #'../third_party/skia/src/animator/SkPaintParts.h',
+        #'../third_party/skia/src/animator/SkParseSVGPath.cpp',
+        #'../third_party/skia/src/animator/SkPathParts.cpp',
+        #'../third_party/skia/src/animator/SkPathParts.h',
+        #'../third_party/skia/src/animator/SkPostParts.cpp',
+        #'../third_party/skia/src/animator/SkPostParts.h',
+        #'../third_party/skia/src/animator/SkScript.cpp',
+        #'../third_party/skia/src/animator/SkScript.h',
+        #'../third_party/skia/src/animator/SkScript2.h',
+        #'../third_party/skia/src/animator/SkScriptCallBack.h',
+        #'../third_party/skia/src/animator/SkScriptDecompile.cpp',
+        #'../third_party/skia/src/animator/SkScriptRuntime.cpp',
+        #'../third_party/skia/src/animator/SkScriptRuntime.h',
+        #'../third_party/skia/src/animator/SkScriptTokenizer.cpp',
+        #'../third_party/skia/src/animator/SkSnapshot.cpp',
+        #'../third_party/skia/src/animator/SkSnapshot.h',
+        #'../third_party/skia/src/animator/SkTDArray_Experimental.h',
+        #'../third_party/skia/src/animator/SkTextOnPath.cpp',
+        #'../third_party/skia/src/animator/SkTextOnPath.h',
+        #'../third_party/skia/src/animator/SkTextToPath.cpp',
+        #'../third_party/skia/src/animator/SkTextToPath.h',
+        #'../third_party/skia/src/animator/SkTime.cpp',
+        #'../third_party/skia/src/animator/SkTypedArray.cpp',
+        #'../third_party/skia/src/animator/SkTypedArray.h',
+        #'../third_party/skia/src/animator/SkXMLAnimatorWriter.cpp',
+        #'../third_party/skia/src/animator/SkXMLAnimatorWriter.h',
+
+        '../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
+        '../third_party/skia/src/core/Sk64.cpp',
+        '../third_party/skia/src/core/SkAlphaRuns.cpp',
+        '../third_party/skia/src/core/SkAntiRun.h',
+        '../third_party/skia/src/core/SkBitmap.cpp',
+        '../third_party/skia/src/core/SkBitmapProcShader.cpp',
+        '../third_party/skia/src/core/SkBitmapProcShader.h',
+        '../third_party/skia/src/core/SkBitmapProcState.cpp',
+        '../third_party/skia/src/core/SkBitmapProcState.h',
+        '../third_party/skia/src/core/SkBitmapProcState_matrix.h',
+        '../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp',
+        '../third_party/skia/src/core/SkBitmapProcState_sample.h',
+        '../third_party/skia/src/core/SkBitmapSampler.cpp',
+        '../third_party/skia/src/core/SkBitmapSampler.h',
+        '../third_party/skia/src/core/SkBitmapSamplerTemplate.h',
+        '../third_party/skia/src/core/SkBitmapShader.cpp',
+        '../third_party/skia/src/core/SkBitmapShader.h',
+        '../third_party/skia/src/core/SkBitmapShader16BilerpTemplate.h',
+        '../third_party/skia/src/core/SkBitmapShaderTemplate.h',
+        '../third_party/skia/src/core/SkBitmap_scroll.cpp',
+        '../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
+        '../third_party/skia/src/core/SkBlitRow.h',
+        '../third_party/skia/src/core/SkBlitRow_D16.cpp',
+        '../third_party/skia/src/core/SkBlitRow_D4444.cpp',
+        '../third_party/skia/src/core/SkBlitter.cpp',
+        '../third_party/skia/src/core/SkBlitter_4444.cpp',
+        '../third_party/skia/src/core/SkBlitter_A1.cpp',
+        '../third_party/skia/src/core/SkBlitter_A8.cpp',
+        '../third_party/skia/src/core/SkBlitter_ARGB32.cpp',
+        '../third_party/skia/src/core/SkBlitter_RGB16.cpp',
+        '../third_party/skia/src/core/SkBlitter_Sprite.cpp',
+        '../third_party/skia/src/core/SkBuffer.cpp',
+        '../third_party/skia/src/core/SkCanvas.cpp',
+        '../third_party/skia/src/core/SkChunkAlloc.cpp',
+        '../third_party/skia/src/core/SkColor.cpp',
+        '../third_party/skia/src/core/SkColorFilter.cpp',
+        '../third_party/skia/src/core/SkColorTable.cpp',
+        '../third_party/skia/src/core/SkComposeShader.cpp',
+        '../third_party/skia/src/core/SkConcaveToTriangles.cpp',
+        '../third_party/skia/src/core/SkConcaveToTriangles.h',
+        '../third_party/skia/src/core/SkCordic.cpp',
+        '../third_party/skia/src/core/SkCordic.h',
+        '../third_party/skia/src/core/SkCoreBlitters.h',
+        '../third_party/skia/src/core/SkCubicClipper.cpp',
+        '../third_party/skia/src/core/SkCubicClipper.h',
+        '../third_party/skia/src/core/SkDebug.cpp',
+        #'../third_party/skia/src/core/SkDebug_stdio.cpp',
+        '../third_party/skia/src/core/SkDeque.cpp',
+        '../third_party/skia/src/core/SkDevice.cpp',
+        '../third_party/skia/src/core/SkDither.cpp',
+        '../third_party/skia/src/core/SkDraw.cpp',
+        '../third_party/skia/src/core/SkDrawProcs.h',
+        #'../third_party/skia/src/core/SkDrawing.cpp',
+        '../third_party/skia/src/core/SkEdge.cpp',
+        '../third_party/skia/src/core/SkEdge.h',
+        '../third_party/skia/src/core/SkFP.h',
+        '../third_party/skia/src/core/SkFilterProc.cpp',
+        '../third_party/skia/src/core/SkFilterProc.h',
+        '../third_party/skia/src/core/SkFlattenable.cpp',
+        '../third_party/skia/src/core/SkFloat.cpp',
+        '../third_party/skia/src/core/SkFloat.h',
+        '../third_party/skia/src/core/SkFloatBits.cpp',
+        '../third_party/skia/src/core/SkGeometry.cpp',
+        '../third_party/skia/src/core/SkGlobals.cpp',
+        '../third_party/skia/src/core/SkGlyphCache.cpp',
+        '../third_party/skia/src/core/SkGlyphCache.h',
+        '../third_party/skia/src/core/SkGraphics.cpp',
+        '../third_party/skia/src/core/SkMMapStream.cpp',
+        '../third_party/skia/src/core/SkMask.cpp',
+        '../third_party/skia/src/core/SkMaskFilter.cpp',
+        '../third_party/skia/src/core/SkMath.cpp',
+        '../third_party/skia/src/core/SkMatrix.cpp',
+        '../third_party/skia/src/core/SkPackBits.cpp',
+        '../third_party/skia/src/core/SkPaint.cpp',
+        '../third_party/skia/src/core/SkPath.cpp',
+        '../third_party/skia/src/core/SkPathEffect.cpp',
+        '../third_party/skia/src/core/SkPathHeap.cpp',
+        '../third_party/skia/src/core/SkPathHeap.h',
+        '../third_party/skia/src/core/SkPathMeasure.cpp',
+        '../third_party/skia/src/core/SkPicture.cpp',
+        '../third_party/skia/src/core/SkPictureFlat.cpp',
+        '../third_party/skia/src/core/SkPictureFlat.h',
+        '../third_party/skia/src/core/SkPicturePlayback.cpp',
+        '../third_party/skia/src/core/SkPicturePlayback.h',
+        '../third_party/skia/src/core/SkPictureRecord.cpp',
+        '../third_party/skia/src/core/SkPictureRecord.h',
+        '../third_party/skia/src/core/SkPixelRef.cpp',
+        '../third_party/skia/src/core/SkPoint.cpp',
+        '../third_party/skia/src/core/SkProcSpriteBlitter.cpp',
+        '../third_party/skia/src/core/SkPtrRecorder.cpp',
+        '../third_party/skia/src/core/SkQuadClipper.cpp',
+        '../third_party/skia/src/core/SkQuadClipper.h',
+        '../third_party/skia/src/core/SkRasterizer.cpp',
+        '../third_party/skia/src/core/SkRect.cpp',
+        '../third_party/skia/src/core/SkRefCnt.cpp',
+        '../third_party/skia/src/core/SkRegion.cpp',
+        '../third_party/skia/src/core/SkRegionPriv.h',
+        '../third_party/skia/src/core/SkRegion_path.cpp',
+        '../third_party/skia/src/core/SkScalerContext.cpp',
+        '../third_party/skia/src/core/SkScan.cpp',
+        '../third_party/skia/src/core/SkScanPriv.h',
+        '../third_party/skia/src/core/SkScan_AntiPath.cpp',
+        '../third_party/skia/src/core/SkScan_Antihair.cpp',
+        '../third_party/skia/src/core/SkScan_Hairline.cpp',
+        '../third_party/skia/src/core/SkScan_Path.cpp',
+        '../third_party/skia/src/core/SkShader.cpp',
+        '../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp',
+        '../third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp',
+        '../third_party/skia/src/core/SkSinTable.h',
+        '../third_party/skia/src/core/SkSpriteBlitter.h',
+        '../third_party/skia/src/core/SkSpriteBlitterTemplate.h',
+        '../third_party/skia/src/core/SkStream.cpp',
+        '../third_party/skia/src/core/SkString.cpp',
+        '../third_party/skia/src/core/SkStroke.cpp',
+        '../third_party/skia/src/core/SkStrokerPriv.cpp',
+        '../third_party/skia/src/core/SkStrokerPriv.h',
+        '../third_party/skia/src/core/SkTSearch.cpp',
+        '../third_party/skia/src/core/SkTSort.h',
+        '../third_party/skia/src/core/SkTemplatesPriv.h',
+        '../third_party/skia/src/core/SkTypeface.cpp',
+        '../third_party/skia/src/core/SkUnPreMultiply.cpp',
+        '../third_party/skia/src/core/SkUtils.cpp',
+        '../third_party/skia/src/core/SkWriter32.cpp',
+        '../third_party/skia/src/core/SkXfermode.cpp',
+        '../third_party/skia/src/core/core_files.mk',
+
+        '../third_party/skia/src/effects/Sk1DPathEffect.cpp',
+        '../third_party/skia/src/effects/Sk2DPathEffect.cpp',
+        '../third_party/skia/src/effects/SkAvoidXfermode.cpp',
+        '../third_party/skia/src/effects/SkBlurDrawLooper.cpp',
+        '../third_party/skia/src/effects/SkBlurMask.cpp',
+        '../third_party/skia/src/effects/SkBlurMask.h',
+        '../third_party/skia/src/effects/SkBlurMaskFilter.cpp',
+        '../third_party/skia/src/effects/SkColorFilters.cpp',
+        '../third_party/skia/src/effects/SkColorMatrixFilter.cpp',
+        '../third_party/skia/src/effects/SkCornerPathEffect.cpp',
+        '../third_party/skia/src/effects/SkDashPathEffect.cpp',
+        '../third_party/skia/src/effects/SkDiscretePathEffect.cpp',
+        '../third_party/skia/src/effects/SkEmbossMask.cpp',
+        '../third_party/skia/src/effects/SkEmbossMask.h',
+        '../third_party/skia/src/effects/SkEmbossMask_Table.h',
+        '../third_party/skia/src/effects/SkEmbossMaskFilter.cpp',
+        '../third_party/skia/src/effects/SkGradientShader.cpp',
+        '../third_party/skia/src/effects/SkKernel33MaskFilter.cpp',
+        '../third_party/skia/src/effects/SkLayerDrawLooper.cpp',
+        '../third_party/skia/src/effects/SkLayerRasterizer.cpp',
+        '../third_party/skia/src/effects/SkNWayCanvas.cpp',
+        '../third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp',
+        '../third_party/skia/src/effects/SkPixelXorXfermode.cpp',
+        '../third_party/skia/src/effects/SkRadialGradient_Table.h',
+        '../third_party/skia/src/effects/SkTransparentShader.cpp',
+
+        '../third_party/skia/src/images/bmpdecoderhelper.cpp',
+        '../third_party/skia/src/images/bmpdecoderhelper.h',
+        '../third_party/skia/src/images/fpdfemb.h',
+        '../third_party/skia/src/images/fpdfemb_ext.h',
+        '../third_party/skia/src/images/SkBitmap_RLEPixels.h',
+        '../third_party/skia/src/images/SkCreateRLEPixelRef.cpp',
+        #'../third_party/skia/src/images/SkFDStream.cpp',
+        #'../third_party/skia/src/images/SkFlipPixelRef.cpp',
+        '../third_party/skia/src/images/SkImageDecoder.cpp',
+        '../third_party/skia/src/images/SkImageDecoder_Factory.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_fpdfemb.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libbmp.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libgif.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libico.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libjpeg.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libpng.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_libpvjpeg.cpp',
+        #'../third_party/skia/src/images/SkImageDecoder_wbmp.cpp',
+        #'../third_party/skia/src/images/SKImageEncoder.cpp',
+        #'../third_party/skia/src/images/SKImageEncoder_Factory.cpp',
+        #'../third_party/skia/src/images/SkImageRef.cpp',
+        #'../third_party/skia/src/images/SkImageRefPool.cpp',
+        #'../third_party/skia/src/images/SkImageRefPool.h',
+        #'../third_party/skia/src/images/SkImageRef_GlobalPool.cpp',
+        #'../third_party/skia/src/images/SkMovie.cpp',
+        #'../third_party/skia/src/images/SkMovie_gif.cpp',
+        '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
+        '../third_party/skia/src/images/SkScaledBitmapSampler.h',
+
+        #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp',
+        '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_android.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_ascender.cpp',
+        '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
+        '../third_party/skia/src/ports/SkFontHost_tables.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_gamma.cpp',
+        '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_linux.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_mac.cpp',
+        '../third_party/skia/src/ports/SkFontHost_none.cpp',
+        #'../third_party/skia/src/ports/SkFontHost_win.cpp',
+        '../third_party/skia/src/ports/SkGlobals_global.cpp',
+        #'../third_party/skia/src/ports/SkImageDecoder_CG.cpp',
+        #'../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
+        #'../third_party/skia/src/ports/SkImageRef_ashmem.cpp',
+        #'../third_party/skia/src/ports/SkImageRef_ashmem.h',
+        #'../third_party/skia/src/ports/SkOSEvent_android.cpp',
+        #'../third_party/skia/src/ports/SkOSEvent_dummy.cpp',
+        '../third_party/skia/src/ports/SkOSFile_stdio.cpp',
+        #'../third_party/skia/src/ports/SkThread_none.cpp',
+        '../third_party/skia/src/ports/SkThread_pthread.cpp',
+        '../third_party/skia/src/ports/SkThread_win.cpp',
+        '../third_party/skia/src/ports/SkTime_Unix.cpp',
+        #'../third_party/skia/src/ports/SkXMLParser_empty.cpp',
+        #'../third_party/skia/src/ports/SkXMLParser_expat.cpp',
+        #'../third_party/skia/src/ports/SkXMLParser_tinyxml.cpp',
+        #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp',
+        '../third_party/skia/src/ports/sk_predefined_gamma.h',
+
+        '../third_party/skia/include/core/Sk64.h',
+        '../third_party/skia/include/core/SkAutoKern.h',
+        '../third_party/skia/include/core/SkBitmap.h',
+        '../third_party/skia/include/core/SkBlitter.h',
+        '../third_party/skia/include/core/SkBounder.h',
+        '../third_party/skia/include/core/SkBuffer.h',
+        '../third_party/skia/include/core/SkCanvas.h',
+        '../third_party/skia/include/core/SkChunkAlloc.h',
+        '../third_party/skia/include/core/SkColor.h',
+        '../third_party/skia/include/core/SkColorFilter.h',
+        '../third_party/skia/include/core/SkColorPriv.h',
+        '../third_party/skia/include/core/SkColorShader.h',
+        '../third_party/skia/include/core/SkComposeShader.h',
+        '../third_party/skia/include/core/SkDeque.h',
+        '../third_party/skia/include/core/SkDescriptor.h',
+        '../third_party/skia/include/core/SkDevice.h',
+        '../third_party/skia/include/core/SkDither.h',
+        '../third_party/skia/include/core/SkDraw.h',
+        '../third_party/skia/include/core/SkDrawFilter.h',
+        '../third_party/skia/include/core/SkDrawLooper.h',
+        '../third_party/skia/include/core/SkDrawing.h',
+        '../third_party/skia/include/core/SkEndian.h',
+        '../third_party/skia/include/core/SkFDot6.h',
+        '../third_party/skia/include/core/SkFixed.h',
+        '../third_party/skia/include/core/SkFlattenable.h',
+        '../third_party/skia/include/core/SkFloatBits.h',
+        '../third_party/skia/include/core/SkFloatingPoint.h',
+        '../third_party/skia/include/core/SkFontHost.h',
+        '../third_party/skia/include/core/SkGeometry.h',
+        '../third_party/skia/include/core/SkGlobals.h',
+        '../third_party/skia/include/core/SkGraphics.h',
+        '../third_party/skia/include/core/SkMMapStream.h',
+        '../third_party/skia/include/core/SkMallocPixelRef.h',
+        '../third_party/skia/include/core/SkMask.h',
+        '../third_party/skia/include/core/SkMaskFilter.h',
+        '../third_party/skia/include/core/SkMath.h',
+        '../third_party/skia/include/core/SkMatrix.h',
+        '../third_party/skia/include/core/SkOSFile.h',
+        '../third_party/skia/include/core/SkPackBits.h',
+        '../third_party/skia/include/core/SkPaint.h',
+        '../third_party/skia/include/core/SkPath.h',
+        '../third_party/skia/include/core/SkPathEffect.h',
+        '../third_party/skia/include/core/SkPathMeasure.h',
+        '../third_party/skia/include/core/SkPerspIter.h',
+        '../third_party/skia/include/core/SkPicture.h',
+        '../third_party/skia/include/core/SkPixelRef.h',
+        '../third_party/skia/include/core/SkPoint.h',
+        '../third_party/skia/include/core/SkPorterDuff.h',
+        '../third_party/skia/include/core/SkPtrRecorder.h',
+        '../third_party/skia/include/core/SkRandom.h',
+        '../third_party/skia/include/core/SkRasterizer.h',
+        '../third_party/skia/include/core/SkReader32.h',
+        '../third_party/skia/include/core/SkRect.h',
+        '../third_party/skia/include/core/SkRefCnt.h',
+        '../third_party/skia/include/core/SkRegion.h',
+        '../third_party/skia/include/core/SkScalar.h',
+        '../third_party/skia/include/core/SkScalarCompare.h',
+        '../third_party/skia/include/core/SkScalerContext.h',
+        '../third_party/skia/include/core/SkScan.h',
+        '../third_party/skia/include/core/SkShader.h',
+        '../third_party/skia/include/core/SkStream.h',
+        '../third_party/skia/include/core/SkString.h',
+        '../third_party/skia/include/core/SkStroke.h',
+        '../third_party/skia/include/core/SkTDArray.h',
+        '../third_party/skia/include/core/SkTDStack.h',
+        '../third_party/skia/include/core/SkTDict.h',
+        '../third_party/skia/include/core/SkTRegistry.h',
+        '../third_party/skia/include/core/SkTSearch.h',
+        '../third_party/skia/include/core/SkTemplates.h',
+        '../third_party/skia/include/core/SkThread.h',
+        '../third_party/skia/include/core/SkThread_platform.h',
+        '../third_party/skia/include/core/SkTime.h',
+        '../third_party/skia/include/core/SkTypeface.h',
+        '../third_party/skia/include/core/SkTypes.h',
+        '../third_party/skia/include/core/SkUnPreMultiply.h',
+        '../third_party/skia/include/core/SkUnitMapper.h',
+        '../third_party/skia/include/core/SkUtils.h',
+        '../third_party/skia/include/core/SkWriter32.h',
+        '../third_party/skia/include/core/SkXfermode.h',
+
+        '../third_party/skia/include/effects/Sk1DPathEffect.h',
+        '../third_party/skia/include/effects/Sk2DPathEffect.h',
+        '../third_party/skia/include/effects/SkAvoidXfermode.h',
+        '../third_party/skia/include/effects/SkBlurDrawLooper.h',
+        '../third_party/skia/include/effects/SkBlurMaskFilter.h',
+        '../third_party/skia/include/effects/SkColorMatrix.h',
+        '../third_party/skia/include/effects/SkColorMatrixFilter.h',
+        '../third_party/skia/include/effects/SkCornerPathEffect.h',
+        '../third_party/skia/include/effects/SkDashPathEffect.h',
+        '../third_party/skia/include/effects/SkDiscretePathEffect.h',
+        '../third_party/skia/include/effects/SkDrawExtraPathEffect.h',
+        '../third_party/skia/include/effects/SkEmbossMaskFilter.h',
+        '../third_party/skia/include/effects/SkGradientShader.h',
+        '../third_party/skia/include/effects/SkKernel33MaskFilter.h',
+        '../third_party/skia/include/effects/SkLayerDrawLooper.h',
+        '../third_party/skia/include/effects/SkLayerRasterizer.h',
+        '../third_party/skia/include/effects/SkNWayCanvas.h',
+        '../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
+        '../third_party/skia/include/effects/SkPixelXorXfermode.h',
+        '../third_party/skia/include/effects/SkTransparentShader.h',
+
+        '../third_party/skia/include/ports/SkStream_Win.h',
+
+        '../third_party/skia/include/images/SkFlipPixelRef.h',
+        '../third_party/skia/include/images/SkImageDecoder.h',
+        '../third_party/skia/include/images/SkImageEncoder.h',
+        '../third_party/skia/include/images/SkImageRef.h',
+        '../third_party/skia/include/images/SkImageRef_GlobalPool.h',
+        '../third_party/skia/include/images/SkMovie.h',
+        '../third_party/skia/include/images/SkPageFlipper.h',
+
         'ext/bitmap_platform_device.h',
         'ext/bitmap_platform_device_linux.cc',
         'ext/bitmap_platform_device_linux.h',
@@ -247,6 +521,8 @@
         'ext/platform_device_mac.h',
         'ext/platform_device_win.cc',
         'ext/platform_device_win.h',
+        'ext/SkMemory_new_handler.cpp',
+        'ext/SkTypeface_fake.cpp',
         'ext/skia_utils.cc',
         'ext/skia_utils.h',
         'ext/skia_utils_mac.cc',
@@ -257,402 +533,14 @@
         'ext/vector_canvas.h',
         'ext/vector_device.cc',
         'ext/vector_device.h',
-        #'gl/SkGL.cpp',
-        #'gl/SkGL.h',
-        #'gl/SkGLCanvas.cpp',
-        #'gl/SkGLDevice.cpp',
-        #'gl/SkGLDevice.h',
-        #'gl/SkGLDevice_FBO.cpp',
-        #'gl/SkGLDevice_FBO.h',
-        #'gl/SkGLDevice_SWLayer.cpp',
-        #'gl/SkGLDevice_SWLayer.h',
-        #'gl/SkGLTextCache.cpp',
-        #'gl/SkGLTextCache.h',
-        #'gl/SkTextureCache.cpp',
-        #'gl/SkTextureCache.h',
-        #'images/bmpdecoderhelper.cpp',
-        #'images/bmpdecoderhelper.h',
-        #'images/fpdfemb.h',
-        #'images/fpdfemb_ext.h',
-        #'images/SkBitmap_RLEPixels.h',
-        #'images/SkCreateRLEPixelRef.cpp',
-        #'images/SkFDStream.cpp',
-        #'images/SkFlipPixelRef.cpp',
-        'images/SkImageDecoder.cpp',
-        #'images/SkImageDecoder_fpdfemb.cpp',
-        #'images/SkImageDecoder_libbmp.cpp',
-        #'images/SkImageDecoder_libgif.cpp',
-        #'images/SkImageDecoder_libico.cpp',
-        #'images/SkImageDecoder_libjpeg.cpp',
-        #'images/SkImageDecoder_libpng.cpp',
-        #'images/SkImageDecoder_libpvjpeg.cpp',
-        #'images/SkImageDecoder_wbmp.cpp',
-        'images/SkImageRef.cpp',
-        #'images/SkImageRef_GlobalPool.cpp',
-        #'images/SkImageRefPool.cpp',
-        #'images/SkImageRefPool.h',
-        'images/SkMMapStream.cpp',
-        #'images/SkMovie.cpp',
-        #'images/SkMovie_gif.cpp',
-        #'images/SkScaledBitmapSampler.cpp',
-        #'images/SkScaledBitmapSampler.h',
-        'images/SkStream.cpp',
-        'include/corecg/Sk64.h',
-        'include/corecg/SkBuffer.h',
-        'include/corecg/SkChunkAlloc.h',
-        'include/corecg/SkEndian.h',
-        'include/corecg/SkFDot6.h',
-        'include/corecg/SkFixed.h',
-        'include/corecg/SkFloatBits.h',
-        'include/corecg/SkFloatingPoint.h',
-        'include/corecg/SkInterpolator.h',
-        'include/corecg/SkMath.h',
-        'include/corecg/SkMatrix.h',
-        'include/corecg/SkPageFlipper.h',
-        'include/corecg/SkPerspIter.h',
-        'include/corecg/SkPoint.h',
-        'include/corecg/SkPostConfig.h',
-        'include/corecg/SkPreConfig.h',
-        'include/corecg/SkRandom.h',
-        'include/corecg/SkRect.h',
-        'include/corecg/SkRegion.h',
-        'include/corecg/SkScalar.h',
-        'include/corecg/SkScalarCompare.h',
-        'include/corecg/SkTemplates.h',
-        'include/corecg/SkThread.h',
-        'include/corecg/SkThread_platform.h',
-        'include/corecg/SkTSearch.h',
-        'include/corecg/SkTypes.h',
-        'include/corecg/SkUserConfig.h',
-        'include/Sk1DPathEffect.h',
-        'include/Sk2DPathEffect.h',
-        'include/SkAnimator.h',
-        'include/SkAnimatorView.h',
-        'include/SkApplication.h',
-        'include/SkAvoidXfermode.h',
-        'include/SkBGViewArtist.h',
-        'include/SkBitmap.h',
-        'include/SkBlurDrawLooper.h',
-        'include/SkBlurMaskFilter.h',
-        'include/SkBML_WXMLParser.h',
-        'include/SkBML_XMLParser.h',
-        'include/SkBorderView.h',
-        'include/SkBounder.h',
-        'include/SkCamera.h',
-        'include/SkCanvas.h',
-        'include/SkColor.h',
-        'include/SkColorFilter.h',
-        'include/SkColorMatrix.h',
-        'include/SkColorMatrixFilter.h',
-        'include/SkColorPriv.h',
-        'include/SkColorShader.h',
-        'include/SkCornerPathEffect.h',
-        'include/SkCullPoints.h',
-        'include/SkDashPathEffect.h',
-        'include/SkDeque.h',
-        'include/SkDescriptor.h',
-        'include/SkDevice.h',
-        'include/SkDiscretePathEffect.h',
-        'include/SkDither.h',
-        'include/SkDOM.h',
-        'include/SkDraw.h',
-        'include/SkDrawExtraPathEffect.h',
-        'include/SkDrawFilter.h',
-        'include/SkDrawLooper.h',
-        'include/SkEmbossMaskFilter.h',
-        'include/SkEvent.h',
-        'include/SkEventSink.h',
-        'include/SkFlattenable.h',
-        'include/SkFlipPixelRef.h',
-        'include/SkFontCodec.h',
-        'include/SkFontHost.h',
-        'include/SkGLCanvas.h',
-        'include/SkGlobals.h',
-        'include/SkGradientShader.h',
-        'include/SkGraphics.h',
-        'include/SkImageDecoder.h',
-        'include/SkImageRef.h',
-        'include/SkImageRef_GlobalPool.h',
-        'include/SkImageView.h',
-        'include/SkJS.h',
-        'include/SkKernel33MaskFilter.h',
-        'include/SkKey.h',
-        'include/SkLayerDrawLooper.h',
-        'include/SkLayerRasterizer.h',
-        'include/SkMallocPixelRef.h',
-        'include/SkMask.h',
-        'include/SkMaskFilter.h',
-        'include/SkMetaData.h',
-        'include/SkMMapStream.h',
-        'include/SkMovie.h',
-        'include/SkNinePatch.h',
-        'include/SkOSFile.h',
-        'include/SkOSMenu.h',
-        'include/SkOSSound.h',
-        'include/SkOSWindow_Mac.h',
-        'include/SkOSWindow_Unix.h',
-        'include/SkOSWindow_Win.h',
-        'include/SkOSWindow_wxwidgets.h',
-        'include/SkPackBits.h',
-        'include/SkPaint.h',
-        'include/SkPaintFlagsDrawFilter.h',
-        'include/SkParse.h',
-        'include/SkParsePaint.h',
-        'include/SkPath.h',
-        'include/SkPathEffect.h',
-        'include/SkPathMeasure.h',
-        'include/SkPicture.h',
-        'include/SkPixelRef.h',
-        'include/SkPixelXorXfermode.h',
-        'include/SkPorterDuff.h',
-        'include/SkProgressBarView.h',
-        'include/SkPtrRecorder.h',
-        'include/SkRasterizer.h',
-        'include/SkReader32.h',
-        'include/SkRefCnt.h',
-        'include/SkScalerContext.h',
-        'include/SkScrollBarView.h',
-        'include/SkShader.h',
-        'include/SkShaderExtras.h',
-        'include/SkStackViewLayout.h',
-        'include/SkStream.h',
-        'include/SkStream_Win.h',
-        'include/SkString.h',
-        'include/SkStroke.h',
-        'include/SkSVGAttribute.h',
-        'include/SkSVGBase.h',
-        'include/SkSVGPaintState.h',
-        'include/SkSVGParser.h',
-        'include/SkSVGTypes.h',
-        'include/SkSystemEventTypes.h',
-        'include/SkTDArray.h',
-        'include/SkTDict.h',
-        'include/SkTDStack.h',
-        'include/SkTextBox.h',
-        'include/SkTime.h',
-        'include/SkTransparentShader.h',
-        'include/SkTypeface.h',
-        'include/SkUnitMapper.h',
-        'include/SkUnitMappers.h',
-        'include/SkUnPreMultiply.h',
-        'include/SkUtils.h',
-        'include/SkView.h',
-        'include/SkViewInflate.h',
-        'include/SkWidget.h',
-        'include/SkWidgetViews.h',
-        'include/SkWindow.h',
-        'include/SkWriter32.h',
-        'include/SkXfermode.h',
-        'include/SkXMLParser.h',
-        'include/SkXMLWriter.h',
-        'picture/SkPathHeap.cpp',
-        'picture/SkPathHeap.h',
-        'picture/SkPicture.cpp',
-        'picture/SkPictureFlat.cpp',
-        'picture/SkPictureFlat.h',
-        'picture/SkPicturePlayback.cpp',
-        'picture/SkPicturePlayback.h',
-        'picture/SkPictureRecord.cpp',
-        'picture/SkPictureRecord.h',
-        'ports/sk_predefined_gamma.h',
-        #'ports/SkFontHost_android.cpp',
-        #'ports/SkFontHost_ascender.cpp',
-        'ports/SkFontHost_fontconfig.cpp',
-        #'ports/SkFontHost_FONTPATH.cpp',
-        'ports/SkFontHost_FreeType.cpp',
-        'ports/SkFontHost_tables.cpp',
-        #'ports/SkFontHost_gamma.cpp',
-        'ports/SkFontHost_gamma_none.cpp',
-        #'ports/SkFontHost_linux.cpp',
-        #'ports/SkFontHost_mac.cpp',
-        'ports/SkFontHost_none.cpp',
-        #'ports/SkFontHost_win.cpp',
-        'ports/SkGlobals_global.cpp',
-        'ports/SkImageDecoder_Factory.cpp',
-        #'ports/SkImageRef_ashmem.cpp',
-        #'ports/SkImageRef_ashmem.h',
-        #'ports/SkOSEvent_android.cpp',
-        #'ports/SkOSEvent_dummy.cpp',
-        'ports/SkOSFile_stdio.cpp',
-        #'ports/SkThread_none.cpp',
-        'ports/SkThread_pthread.cpp',
-        'ports/SkThread_win.cpp',
-        'ports/SkTime_Unix.cpp',
-        #'ports/SkXMLParser_empty.cpp',
-        #'ports/SkXMLParser_expat.cpp',
-        #'ports/SkXMLParser_tinyxml.cpp',
-        #'ports/SkXMLPullParser_expat.cpp',
-        'sgl/ARGB32_Clamp_Bilinear_BitmapShader.h',
-        'sgl/SkAlphaRuns.cpp',
-        'sgl/SkAntiRun.h',
-        'sgl/SkAutoKern.h',
-        'sgl/SkBitmap.cpp',
-        #'sgl/SkBitmap_scroll.cpp',
-        'sgl/SkBitmapProcShader.cpp',
-        'sgl/SkBitmapProcShader.h',
-        'sgl/SkBitmapProcState.cpp',
-        'sgl/SkBitmapProcState.h',
-        'sgl/SkBitmapProcState_matrix.h',
-        'sgl/SkBitmapProcState_matrixProcs.cpp',
-        'sgl/SkBitmapProcState_sample.h',
-        'sgl/SkBitmapSampler.cpp',
-        'sgl/SkBitmapSampler.h',
-        'sgl/SkBitmapSamplerTemplate.h',
-        'sgl/SkBitmapShader.cpp',
-        'sgl/SkBitmapShader.h',
-        'sgl/SkBitmapShader16BilerpTemplate.h',
-        'sgl/SkBitmapShaderTemplate.h',
-        'sgl/SkBlitBWMaskTemplate.h',
-        'sgl/SkBlitRow.h',
-        'sgl/SkBlitRow_D16.cpp',
-        'sgl/SkBlitRow_D4444.cpp',
-        'sgl/SkBlitter.cpp',
-        'sgl/SkBlitter.h',
-        'sgl/SkBlitter_4444.cpp',
-        'sgl/SkBlitter_A1.cpp',
-        'sgl/SkBlitter_A8.cpp',
-        'sgl/SkBlitter_ARGB32.cpp',
-        'sgl/SkBlitter_RGB16.cpp',
-        'sgl/SkBlitter_Sprite.cpp',
-        'sgl/SkCanvas.cpp',
-        'sgl/SkColor.cpp',
-        'sgl/SkColorFilter.cpp',
-        'sgl/SkColorTable.cpp',
-        'sgl/SkCoreBlitters.h',
-        'sgl/SkDeque.cpp',
-        'sgl/SkDevice.cpp',
-        'sgl/SkDither.cpp',
-        'sgl/SkDraw.cpp',
-        'sgl/SkDrawProcs.h',
-        'sgl/SkEdge.cpp',
-        'sgl/SkEdge.h',
-        'sgl/SkFilterProc.cpp',
-        'sgl/SkFilterProc.h',
-        'sgl/SkFlattenable.cpp',
-        'sgl/SkFP.h',
-        'sgl/SkGeometry.cpp',
-        'sgl/SkGeometry.h',
-        'sgl/SkGlobals.cpp',
-        'sgl/SkGlyphCache.cpp',
-        'sgl/SkGlyphCache.h',
-        'sgl/SkGraphics.cpp',
-        'sgl/SkMask.cpp',
-        'sgl/SkMaskFilter.cpp',
-        'sgl/SkPackBits.cpp',
-        'sgl/SkPaint.cpp',
-        'sgl/SkPath.cpp',
-        'sgl/SkPathEffect.cpp',
-        'sgl/SkPathMeasure.cpp',
-        'sgl/SkPixelRef.cpp',
-        'sgl/SkProcSpriteBlitter.cpp',
-        'sgl/SkPtrRecorder.cpp',
-        'sgl/SkRasterizer.cpp',
-        'sgl/SkRefCnt.cpp',
-        'sgl/SkRegion_path.cpp',
-        'sgl/SkScalerContext.cpp',
-        'sgl/SkScan.cpp',
-        'sgl/SkScan.h',
-        'sgl/SkScan_Antihair.cpp',
-        'sgl/SkScan_AntiPath.cpp',
-        'sgl/SkScan_Hairline.cpp',
-        'sgl/SkScan_Path.cpp',
-        'sgl/SkScanPriv.h',
-        'sgl/SkShader.cpp',
-        'sgl/SkSpriteBlitter.h',
-        'sgl/SkSpriteBlitter_ARGB32.cpp',
-        'sgl/SkSpriteBlitter_RGB16.cpp',
-        'sgl/SkSpriteBlitterTemplate.h',
-        'sgl/SkString.cpp',
-        'sgl/SkStroke.cpp',
-        'sgl/SkStrokerPriv.cpp',
-        'sgl/SkStrokerPriv.h',
-        'sgl/SkTemplatesPriv.h',
-        'sgl/SkTSearch.cpp',
-        'sgl/SkTSort.h',
-        'sgl/SkTypeface.cpp',
-        'sgl/SkTypeface_fake.cpp',
-        'sgl/SkUnPreMultiply.cpp',
-        'sgl/SkUtils.cpp',
-        'sgl/SkWriter32.cpp',
-        'sgl/SkXfermode.cpp',
-        #'svg/SkSVG.cpp',
-        #'svg/SkSVGCircle.cpp',
-        #'svg/SkSVGCircle.h',
-        #'svg/SkSVGClipPath.cpp',
-        #'svg/SkSVGClipPath.h',
-        #'svg/SkSVGDefs.cpp',
-        #'svg/SkSVGDefs.h',
-        #'svg/SkSVGElements.cpp',
-        #'svg/SkSVGElements.h',
-        #'svg/SkSVGEllipse.cpp',
-        #'svg/SkSVGEllipse.h',
-        #'svg/SkSVGFeColorMatrix.cpp',
-        #'svg/SkSVGFeColorMatrix.h',
-        #'svg/SkSVGFilter.cpp',
-        #'svg/SkSVGFilter.h',
-        #'svg/SkSVGG.cpp',
-        #'svg/SkSVGG.h',
-        #'svg/SkSVGGradient.cpp',
-        #'svg/SkSVGGradient.h',
-        #'svg/SkSVGGroup.cpp',
-        #'svg/SkSVGGroup.h',
-        #'svg/SkSVGImage.cpp',
-        #'svg/SkSVGImage.h',
-        #'svg/SkSVGLine.cpp',
-        #'svg/SkSVGLine.h',
-        #'svg/SkSVGLinearGradient.cpp',
-        #'svg/SkSVGLinearGradient.h',
-        #'svg/SkSVGMask.cpp',
-        #'svg/SkSVGMask.h',
-        #'svg/SkSVGMetadata.cpp',
-        #'svg/SkSVGMetadata.h',
-        #'svg/SkSVGPaintState.cpp',
-        #'svg/SkSVGParser.cpp',
-        #'svg/SkSVGPath.cpp',
-        #'svg/SkSVGPath.h',
-        #'svg/SkSVGPolygon.cpp',
-        #'svg/SkSVGPolygon.h',
-        #'svg/SkSVGPolyline.cpp',
-        #'svg/SkSVGPolyline.h',
-        #'svg/SkSVGRadialGradient.cpp',
-        #'svg/SkSVGRadialGradient.h',
-        #'svg/SkSVGRect.cpp',
-        #'svg/SkSVGRect.h',
-        #'svg/SkSVGStop.cpp',
-        #'svg/SkSVGStop.h',
-        #'svg/SkSVGSVG.cpp',
-        #'svg/SkSVGSVG.h',
-        #'svg/SkSVGSymbol.cpp',
-        #'svg/SkSVGSymbol.h',
-        #'svg/SkSVGText.cpp',
-        #'svg/SkSVGText.h',
-        #'svg/SkSVGUse.cpp',
-        #'svg/SkSVGUse.h',
-        #'text/ATextEntry.h',
-        #'views/SkEvent.cpp',
-        #'views/SkEventSink.cpp',
-        #'views/SkMetaData.cpp',
-        #'views/SkTagList.cpp',
-        #'views/SkTagList.h',
-        #'views/SkTextBox.cpp',
-        #'xml/SkBML_Verbs.h',
-        #'xml/SkBML_XMLParser.cpp',
-        #'xml/SkDOM.cpp',
-        #'xml/SkJS.cpp',
-        #'xml/SkJSDisplayable.cpp',
-        #'xml/SkParse.cpp',
-        #'xml/SkParseColor.cpp',
-        #'xml/SkXMLParser.cpp',
-        #'xml/SkXMLPullParser.cpp',
-        #'xml/SkXMLWriter.cpp',
       ],
       'include_dirs': [
         '..',
-        'corecg',
-        'include',
-        'include/corecg',
-        'picture',
-        'sgl',
+        'config',
+        '../third_party/skia/include/core',
+        '../third_party/skia/include/effects',
+        '../third_party/skia/include/images',
+        '../third_party/skia/include/utils',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'mac_framework_dirs': [
@@ -662,7 +550,7 @@
         'SK_BUILD_NO_IMAGE_ENCODE',
       ],
       'sources!': [
-        'include/corecg/SkTypes.h',
+        '../third_party/skia/include/core/SkTypes.h',
         'precompiled.cc',
       ],
       'conditions': [
@@ -672,11 +560,13 @@
         [ 'OS != "linux"', {
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
-            'ports/SkFontHost_FreeType.cpp',
-            'ports/SkFontHost_gamma_none.cpp',
-            'ports/SkFontHost_fontconfig.cpp',
-            'ports/SkFontHost_tables.cpp',
-            'sgl/SkTypeface.cpp',
+            '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
+            '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp',
+            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
+            '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
+            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
+            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
+            '../third_party/skia/src/core/SkTypeface.cpp',
           ],
         }],
         [ 'OS != "win"', {
@@ -699,8 +589,8 @@
             '-Wno-unused-function',
           ],
           'sources!': [
-            'ports/SkFontHost_none.cpp',
-            'sgl/SkTypeface_fake.cpp',
+            '../third_party/skia/src/ports/SkFontHost_none.cpp',
+            'ext/SkTypeface_fake.cpp',
           ],
           'export_dependent_settings': [
             '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
@@ -714,22 +604,26 @@
         }],
         [ 'OS == "win"', {
           'sources!': [
-            'images/SkMMapStream.cpp',
-            'ports/SkThread_pthread.cpp',
-            'ports/SkTime_Unix.cc',
+            '../third_party/skia/src/core/SkMMapStream.cpp',
+            '../third_party/skia/src/ports/SkThread_pthread.cpp',
+            '../third_party/skia/src/ports/SkTime_Unix.cc',
           ],
           'configurations': {
             'Debug': {
-              'msvs_precompiled_header': 'include/corecg/SkTypes.h',
+              'msvs_precompiled_header': 'include/core/SkTypes.h',
               'msvs_precompiled_source': 'precompiled.cc',
             },
           },
+          'include_dirs': [
+            'config/win',
+          ],
         },],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          'include',
-          'include/corecg',
+          'config',
+          '../third_party/skia/include/core',
+          '../third_party/skia/include/effects',
           'ext',
         ],
       },