From aa57295df4f63dcb64f37b933a7bb5f11832ae20 Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Sun, 17 Feb 2019 13:38:45 +0800 Subject: [PATCH] import changes from rmottola/Arctic-Fox: - Bug 1188462 - Rename gfx/skia/trunk directory to gfx/skia/skia. (26e6a37fd) - Bug 1188462 - Fix inclusion of skia headers to use correct directory prefixes. (cb8a82d14) - Bug 1188462 - Add SKIA_INCLUDES list for adding Skia to header search path. (0f95f6f77) - Bug 1157065 - GFX: 2D: Implement skia::Convolve in LS3 MMI. * skia::ConvolveVertically * skia:ConvolveHorizontally * skia:ConvolveHorizontally4 (445c1a64e) --- configure.in | 3 + dom/canvas/moz.build | 3 + gfx/2d/DrawTargetSkia.cpp | 25 +- gfx/2d/DrawTargetSkia.h | 6 +- gfx/2d/HelpersSkia.h | 8 +- gfx/2d/PathSkia.h | 2 +- gfx/2d/Scale.cpp | 2 +- gfx/2d/ScaledFontBase.cpp | 2 +- gfx/2d/ScaledFontBase.h | 4 +- gfx/2d/ScaledFontCairo.cpp | 4 +- gfx/2d/ScaledFontMac.cpp | 6 +- gfx/2d/ScaledFontWin.cpp | 2 +- gfx/2d/SourceSurfaceSkia.cpp | 9 +- gfx/2d/SourceSurfaceSkia.h | 4 +- gfx/2d/convolver.cpp | 50 +- gfx/2d/convolver.h | 2 +- gfx/2d/convolverLS3.cpp | 831 ++++++++++ gfx/2d/convolverLS3.h | 70 + gfx/2d/convolverSSE2.cpp | 2 +- gfx/2d/convolverSSE2.h | 2 +- gfx/2d/image_operations.cpp | 8 +- gfx/2d/image_operations.h | 4 +- gfx/2d/moz.build | 14 + gfx/gl/SkiaGLGlue.cpp | 4 +- gfx/gl/SkiaGLGlue.h | 4 +- gfx/gl/moz.build | 2 + gfx/layers/basic/BasicCompositor.cpp | 4 +- gfx/layers/basic/BasicLayerManager.cpp | 4 +- gfx/layers/moz.build | 2 + gfx/skia/generate_mozbuild.py | 26 +- gfx/skia/moz.build | 1404 +++++++---------- .../include/animator/SkAnimator.h | 0 .../include/animator/SkAnimatorView.h | 0 .../include/config/SkUserConfig.h | 12 +- .../include/core/SkAdvancedTypefaceMetrics.h | 0 .../include/core/SkAnnotation.h | 0 .../include/core/SkBBHFactory.h | 0 .../{trunk => skia}/include/core/SkBitmap.h | 0 .../include/core/SkBitmapDevice.h | 0 .../{trunk => skia}/include/core/SkBlitRow.h | 0 .../include/core/SkBlurTypes.h | 0 .../{trunk => skia}/include/core/SkCanvas.h | 0 .../include/core/SkChunkAlloc.h | 0 .../include/core/SkClipStack.h | 0 .../{trunk => skia}/include/core/SkColor.h | 0 .../include/core/SkColorFilter.h | 0 .../include/core/SkColorPriv.h | 0 .../include/core/SkColorShader.h | 0 .../include/core/SkColorTable.h | 0 .../include/core/SkComposeShader.h | 0 .../{trunk => skia}/include/core/SkData.h | 0 .../include/core/SkDataTable.h | 0 .../{trunk => skia}/include/core/SkDeque.h | 0 .../{trunk => skia}/include/core/SkDevice.h | 0 .../include/core/SkDeviceProperties.h | 0 .../{trunk => skia}/include/core/SkDither.h | 0 .../{trunk => skia}/include/core/SkDocument.h | 0 .../{trunk => skia}/include/core/SkDraw.h | 0 .../include/core/SkDrawFilter.h | 0 .../include/core/SkDrawLooper.h | 0 .../include/core/SkDrawPictureCallback.h | 0 .../include/core/SkDynamicAnnotations.h | 0 .../{trunk => skia}/include/core/SkEndian.h | 0 .../{trunk => skia}/include/core/SkError.h | 0 .../{trunk => skia}/include/core/SkFixed.h | 0 .../include/core/SkFlattenable.h | 0 .../include/core/SkFlattenableBuffers.h | 0 .../include/core/SkFlattenableSerialization.h | 0 .../include/core/SkFloatBits.h | 0 .../include/core/SkFloatingPoint.h | 0 .../{trunk => skia}/include/core/SkFont.h | 0 .../{trunk => skia}/include/core/SkFontHost.h | 0 .../include/core/SkFontLCDConfig.h | 0 .../{trunk => skia}/include/core/SkGraphics.h | 0 .../{trunk => skia}/include/core/SkImage.h | 0 .../include/core/SkImageDecoder.h | 0 .../include/core/SkImageEncoder.h | 0 .../include/core/SkImageFilter.h | 0 .../include/core/SkImageGenerator.h | 0 .../include/core/SkImageInfo.h | 0 .../{trunk => skia}/include/core/SkInstCnt.h | 0 .../include/core/SkMallocPixelRef.h | 0 .../{trunk => skia}/include/core/SkMask.h | 0 .../include/core/SkMaskFilter.h | 0 .../{trunk => skia}/include/core/SkMath.h | 0 .../{trunk => skia}/include/core/SkMatrix.h | 0 .../{trunk => skia}/include/core/SkMetaData.h | 0 .../{trunk => skia}/include/core/SkOSFile.h | 0 .../{trunk => skia}/include/core/SkOnce.h | 0 .../{trunk => skia}/include/core/SkPackBits.h | 0 .../{trunk => skia}/include/core/SkPaint.h | 0 .../include/core/SkPaintOptionsAndroid.h | 0 .../{trunk => skia}/include/core/SkPatch.h | 0 .../{trunk => skia}/include/core/SkPath.h | 0 .../include/core/SkPathEffect.h | 0 .../include/core/SkPathMeasure.h | 0 .../{trunk => skia}/include/core/SkPathRef.h | 0 .../{trunk => skia}/include/core/SkPicture.h | 0 .../include/core/SkPictureRecorder.h | 0 .../{trunk => skia}/include/core/SkPixelRef.h | 0 .../{trunk => skia}/include/core/SkPoint.h | 0 .../include/core/SkPostConfig.h | 0 .../include/core/SkPreConfig.h | 0 .../{trunk => skia}/include/core/SkRRect.h | 0 .../include/core/SkRasterizer.h | 0 .../include/core/SkReadBuffer.h | 0 .../{trunk => skia}/include/core/SkReader32.h | 0 .../{trunk => skia}/include/core/SkRect.h | 0 .../{trunk => skia}/include/core/SkRefCnt.h | 0 .../{trunk => skia}/include/core/SkRegion.h | 0 .../{trunk => skia}/include/core/SkScalar.h | 0 .../{trunk => skia}/include/core/SkShader.h | 2 +- .../{trunk => skia}/include/core/SkSize.h | 0 .../{trunk => skia}/include/core/SkStream.h | 0 .../{trunk => skia}/include/core/SkString.h | 0 .../include/core/SkStrokeRec.h | 0 .../{trunk => skia}/include/core/SkSurface.h | 0 .../{trunk => skia}/include/core/SkTArray.h | 0 .../{trunk => skia}/include/core/SkTDArray.h | 0 .../{trunk => skia}/include/core/SkTDStack.h | 0 .../{trunk => skia}/include/core/SkTDict.h | 0 .../include/core/SkTInternalLList.h | 0 .../{trunk => skia}/include/core/SkTLazy.h | 0 .../include/core/SkTRegistry.h | 0 .../{trunk => skia}/include/core/SkTSearch.h | 0 .../include/core/SkTemplates.h | 0 .../{trunk => skia}/include/core/SkThread.h | 0 .../{trunk => skia}/include/core/SkTime.h | 0 .../{trunk => skia}/include/core/SkTypeface.h | 0 .../{trunk => skia}/include/core/SkTypes.h | 0 .../include/core/SkUnPreMultiply.h | 0 .../{trunk => skia}/include/core/SkUtils.h | 0 .../include/core/SkWeakRefCnt.h | 0 .../include/core/SkWriteBuffer.h | 0 .../{trunk => skia}/include/core/SkWriter32.h | 0 .../{trunk => skia}/include/core/SkXfermode.h | 0 .../include/device/xps/SkConstexprMath.h | 0 .../include/device/xps/SkXPSDevice.h | 0 .../include/effects/Sk1DPathEffect.h | 0 .../include/effects/Sk2DPathEffect.h | 0 .../include/effects/SkAlphaThresholdFilter.h | 0 .../include/effects/SkArithmeticMode.h | 0 .../include/effects/SkAvoidXfermode.h | 0 .../include/effects/SkBitmapSource.h | 0 .../include/effects/SkBlurDrawLooper.h | 0 .../include/effects/SkBlurImageFilter.h | 0 .../include/effects/SkBlurMaskFilter.h | 0 .../effects/SkColorFilterImageFilter.h | 0 .../include/effects/SkColorMatrix.h | 0 .../include/effects/SkColorMatrixFilter.h | 0 .../include/effects/SkComposeImageFilter.h | 0 .../include/effects/SkCornerPathEffect.h | 0 .../include/effects/SkDashPathEffect.h | 0 .../include/effects/SkDiscretePathEffect.h | 0 .../include/effects/SkDisplacementMapEffect.h | 0 .../include/effects/SkDrawExtraPathEffect.h | 0 .../include/effects/SkDropShadowImageFilter.h | 0 .../include/effects/SkEmbossMaskFilter.h | 0 .../include/effects/SkGradientShader.h | 0 .../include/effects/SkLayerDrawLooper.h | 0 .../include/effects/SkLayerRasterizer.h | 0 .../include/effects/SkLerpXfermode.h | 0 .../include/effects/SkLightingImageFilter.h | 0 .../include/effects/SkLumaColorFilter.h | 0 .../include/effects/SkMagnifierImageFilter.h | 0 .../effects/SkMatrixConvolutionImageFilter.h | 0 .../include/effects/SkMatrixImageFilter.h | 0 .../include/effects/SkMergeImageFilter.h | 0 .../include/effects/SkMorphologyImageFilter.h | 0 .../include/effects/SkOffsetImageFilter.h | 0 .../include/effects/SkPaintFlagsDrawFilter.h | 0 .../include/effects/SkPerlinNoiseShader.h | 0 .../include/effects/SkPictureImageFilter.h | 0 .../include/effects/SkPixelXorXfermode.h | 0 .../include/effects/SkPorterDuff.h | 0 .../include/effects/SkRectShaderImageFilter.h | 0 .../include/effects/SkStippleMaskFilter.h | 0 .../include/effects/SkTableColorFilter.h | 0 .../include/effects/SkTableMaskFilter.h | 0 .../include/effects/SkTestImageFilters.h | 0 .../include/effects/SkTileImageFilter.h | 0 .../include/effects/SkTransparentShader.h | 0 .../include/effects/SkXfermodeImageFilter.h | 0 .../include/gpu/GrBackendEffectFactory.h | 0 .../{trunk => skia}/include/gpu/GrClipData.h | 0 .../{trunk => skia}/include/gpu/GrColor.h | 0 .../{trunk => skia}/include/gpu/GrConfig.h | 0 .../{trunk => skia}/include/gpu/GrContext.h | 0 .../include/gpu/GrContextFactory.h | 0 .../include/gpu/GrCoordTransform.h | 0 .../include/gpu/GrDrawEffect.h | 0 .../{trunk => skia}/include/gpu/GrEffect.h | 0 .../include/gpu/GrEffectStage.h | 0 .../include/gpu/GrEffectUnitTest.h | 0 .../include/gpu/GrFontScaler.h | 0 .../{trunk => skia}/include/gpu/GrGlyph.h | 0 .../include/gpu/GrGpuResource.h | 0 .../{trunk => skia}/include/gpu/GrPaint.h | 0 .../include/gpu/GrPathRendererChain.h | 0 gfx/skia/{trunk => skia}/include/gpu/GrRect.h | 0 .../include/gpu/GrRenderTarget.h | 0 .../{trunk => skia}/include/gpu/GrSurface.h | 0 .../include/gpu/GrTBackendEffectFactory.h | 0 .../{trunk => skia}/include/gpu/GrTexture.h | 0 .../include/gpu/GrTextureAccess.h | 0 .../{trunk => skia}/include/gpu/GrTypes.h | 0 .../{trunk => skia}/include/gpu/GrTypesPriv.h | 0 .../include/gpu/GrUserConfig.h | 0 .../{trunk => skia}/include/gpu/SkGpuDevice.h | 0 gfx/skia/{trunk => skia}/include/gpu/SkGr.h | 0 .../include/gpu/SkGrPixelRef.h | 0 .../include/gpu/SkGrTexturePixelRef.h | 0 .../include/gpu/gl/GrGLConfig.h | 0 .../include/gpu/gl/GrGLConfig_chrome.h | 0 .../include/gpu/gl/GrGLExtensions.h | 0 .../include/gpu/gl/GrGLFunctions.h | 0 .../include/gpu/gl/GrGLInterface.h | 0 .../include/gpu/gl/SkANGLEGLContext.h | 0 .../include/gpu/gl/SkDebugGLContext.h | 0 .../include/gpu/gl/SkGLContextHelper.h | 0 .../include/gpu/gl/SkMesaGLContext.h | 0 .../include/gpu/gl/SkNativeGLContext.h | 0 .../include/gpu/gl/SkNullGLContext.h | 0 .../include/images/SkDecodingImageGenerator.h | 0 .../include/images/SkForceLinking.h | 0 .../{trunk => skia}/include/images/SkMovie.h | 0 .../include/images/SkPageFlipper.h | 0 .../include/pathops/SkPathOps.h | 0 .../{trunk => skia}/include/pdf/SkPDFDevice.h | 0 .../include/pdf/SkPDFDocument.h | 0 .../{trunk => skia}/include/pipe/SkGPipe.h | 0 .../include/ports/SkFontConfigInterface.h | 0 .../{trunk => skia}/include/ports/SkFontMgr.h | 0 .../include/ports/SkFontMgr_indirect.h | 0 .../include/ports/SkFontStyle.h | 0 .../include/ports/SkRemotableFontMgr.h | 0 .../include/ports/SkTypeface_android.h | 0 .../include/ports/SkTypeface_cairo.h | 0 .../include/ports/SkTypeface_mac.h | 0 .../include/ports/SkTypeface_win.h | 0 .../include/record/SkRecording.h | 0 .../include/svg/SkSVGAttribute.h | 0 .../{trunk => skia}/include/svg/SkSVGBase.h | 0 .../include/svg/SkSVGPaintState.h | 0 .../{trunk => skia}/include/svg/SkSVGParser.h | 0 .../{trunk => skia}/include/svg/SkSVGTypes.h | 0 .../include/utils/SkBoundaryPatch.h | 0 .../{trunk => skia}/include/utils/SkCamera.h | 0 .../include/utils/SkCanvasStateUtils.h | 0 .../{trunk => skia}/include/utils/SkCondVar.h | 0 .../include/utils/SkCubicInterval.h | 0 .../include/utils/SkCullPoints.h | 0 .../include/utils/SkDebugUtils.h | 0 .../include/utils/SkDeferredCanvas.h | 0 .../include/utils/SkDumpCanvas.h | 0 .../include/utils/SkEventTracer.h | 0 .../include/utils/SkFrontBufferedStream.h | 0 .../include/utils/SkInterpolator.h | 0 .../{trunk => skia}/include/utils/SkJSONCPP.h | 0 .../{trunk => skia}/include/utils/SkLayer.h | 0 .../{trunk => skia}/include/utils/SkLua.h | 0 .../include/utils/SkLuaCanvas.h | 0 .../include/utils/SkMatrix44.h | 0 .../include/utils/SkMeshUtils.h | 0 .../include/utils/SkNWayCanvas.h | 0 .../include/utils/SkNinePatch.h | 0 .../include/utils/SkNoSaveLayerCanvas.h | 0 .../include/utils/SkNullCanvas.h | 0 .../{trunk => skia}/include/utils/SkParse.h | 0 .../include/utils/SkParsePaint.h | 0 .../include/utils/SkParsePath.h | 0 .../include/utils/SkPathUtils.h | 0 .../include/utils/SkPictureUtils.h | 0 .../include/utils/SkProxyCanvas.h | 0 .../{trunk => skia}/include/utils/SkRTConf.h | 0 .../{trunk => skia}/include/utils/SkRandom.h | 0 .../include/utils/SkRunnable.h | 0 .../include/utils/SkThreadPool.h | 0 .../{trunk => skia}/include/utils/SkWGL.h | 0 .../include/utils/ios/SkStream_NSData.h | 0 .../include/utils/mac/SkCGUtils.h | 0 .../include/utils/win/SkAutoCoInitialize.h | 0 .../include/utils/win/SkHRESULT.h | 0 .../include/utils/win/SkIStream.h | 0 .../include/utils/win/SkTScopedComPtr.h | 0 .../include/views/SkApplication.h | 0 .../include/views/SkBGViewArtist.h | 0 .../{trunk => skia}/include/views/SkEvent.h | 0 .../include/views/SkEventSink.h | 0 .../{trunk => skia}/include/views/SkKey.h | 0 .../{trunk => skia}/include/views/SkOSMenu.h | 0 .../include/views/SkOSWindow_Android.h | 0 .../include/views/SkOSWindow_Mac.h | 0 .../include/views/SkOSWindow_NaCl.h | 0 .../include/views/SkOSWindow_SDL.h | 0 .../include/views/SkOSWindow_Unix.h | 0 .../include/views/SkOSWindow_Win.h | 0 .../include/views/SkOSWindow_iOS.h | 0 .../include/views/SkStackViewLayout.h | 0 .../include/views/SkSystemEventTypes.h | 0 .../{trunk => skia}/include/views/SkTextBox.h | 0 .../include/views/SkTouchGesture.h | 0 .../{trunk => skia}/include/views/SkView.h | 0 .../include/views/SkViewInflate.h | 0 .../{trunk => skia}/include/views/SkWidget.h | 0 .../{trunk => skia}/include/views/SkWindow.h | 0 .../include/views/android/AndroidKeyToSkKey.h | 0 .../include/views/animated/SkBorderView.h | 0 .../include/views/animated/SkImageView.h | 0 .../views/animated/SkProgressBarView.h | 0 .../include/views/animated/SkScrollBarView.h | 0 .../include/views/animated/SkWidgetViews.h | 0 .../include/views/unix/XkeysToSkKeys.h | 0 .../include/views/unix/keysym2ucs.h | 0 .../include/xml/SkBML_WXMLParser.h | 0 .../include/xml/SkBML_XMLParser.h | 0 gfx/skia/{trunk => skia}/include/xml/SkDOM.h | 0 gfx/skia/{trunk => skia}/include/xml/SkJS.h | 0 .../{trunk => skia}/include/xml/SkXMLParser.h | 0 .../{trunk => skia}/include/xml/SkXMLWriter.h | 0 .../{trunk => skia}/src/animator/SkAnimate.h | 0 .../src/animator/SkAnimate3DSchema.xsd | 0 .../src/animator/SkAnimate3DSchema.xsx | 0 .../src/animator/SkAnimateActive.cpp | 0 .../src/animator/SkAnimateActive.h | 0 .../src/animator/SkAnimateBase.cpp | 0 .../src/animator/SkAnimateBase.h | 0 .../src/animator/SkAnimateField.cpp | 0 .../src/animator/SkAnimateMaker.cpp | 0 .../src/animator/SkAnimateMaker.h | 0 .../src/animator/SkAnimateProperties.h | 0 .../src/animator/SkAnimateSchema.xsd | 0 .../src/animator/SkAnimateSchema.xsx | 0 .../src/animator/SkAnimateSet.cpp | 0 .../src/animator/SkAnimateSet.h | 0 .../src/animator/SkAnimator.cpp | 0 .../src/animator/SkAnimatorScript.cpp | 0 .../src/animator/SkAnimatorScript.h | 0 .../src/animator/SkAnimatorScript2.cpp | 0 .../src/animator/SkAnimatorScript2.h | 0 .../src/animator/SkBoundable.cpp | 0 .../src/animator/SkBoundable.h | 0 .../src/animator/SkBuildCondensedInfo.cpp | 0 .../src/animator/SkCondensedDebug.cpp | 0 .../src/animator/SkCondensedRelease.cpp | 0 .../src/animator/SkDisplayAdd.cpp | 0 .../src/animator/SkDisplayAdd.h | 0 .../src/animator/SkDisplayApply.cpp | 0 .../src/animator/SkDisplayApply.h | 0 .../src/animator/SkDisplayBounds.cpp | 0 .../src/animator/SkDisplayBounds.h | 0 .../src/animator/SkDisplayEvent.cpp | 0 .../src/animator/SkDisplayEvent.h | 0 .../src/animator/SkDisplayEvents.cpp | 0 .../src/animator/SkDisplayEvents.h | 0 .../src/animator/SkDisplayInclude.cpp | 0 .../src/animator/SkDisplayInclude.h | 0 .../src/animator/SkDisplayInput.cpp | 0 .../src/animator/SkDisplayInput.h | 0 .../src/animator/SkDisplayList.cpp | 0 .../src/animator/SkDisplayList.h | 0 .../src/animator/SkDisplayMath.cpp | 0 .../src/animator/SkDisplayMath.h | 0 .../src/animator/SkDisplayMovie.cpp | 0 .../src/animator/SkDisplayMovie.h | 0 .../src/animator/SkDisplayNumber.cpp | 0 .../src/animator/SkDisplayNumber.h | 0 .../src/animator/SkDisplayPost.cpp | 0 .../src/animator/SkDisplayPost.h | 0 .../src/animator/SkDisplayRandom.cpp | 0 .../src/animator/SkDisplayRandom.h | 0 .../src/animator/SkDisplayScreenplay.cpp | 0 .../src/animator/SkDisplayScreenplay.h | 0 .../src/animator/SkDisplayType.cpp | 0 .../src/animator/SkDisplayType.h | 0 .../src/animator/SkDisplayTypes.cpp | 0 .../src/animator/SkDisplayTypes.h | 0 .../src/animator/SkDisplayXMLParser.cpp | 0 .../src/animator/SkDisplayXMLParser.h | 0 .../src/animator/SkDisplayable.cpp | 0 .../src/animator/SkDisplayable.h | 0 .../{trunk => skia}/src/animator/SkDraw3D.cpp | 0 .../{trunk => skia}/src/animator/SkDraw3D.h | 0 .../src/animator/SkDrawBitmap.cpp | 0 .../src/animator/SkDrawBitmap.h | 0 .../src/animator/SkDrawBlur.cpp | 0 .../{trunk => skia}/src/animator/SkDrawBlur.h | 0 .../src/animator/SkDrawClip.cpp | 0 .../{trunk => skia}/src/animator/SkDrawClip.h | 0 .../src/animator/SkDrawColor.cpp | 0 .../src/animator/SkDrawColor.h | 0 .../src/animator/SkDrawDash.cpp | 0 .../{trunk => skia}/src/animator/SkDrawDash.h | 0 .../src/animator/SkDrawDiscrete.cpp | 0 .../src/animator/SkDrawDiscrete.h | 0 .../src/animator/SkDrawEmboss.cpp | 0 .../src/animator/SkDrawEmboss.h | 0 .../src/animator/SkDrawExtraPathEffect.cpp | 0 .../src/animator/SkDrawFull.cpp | 0 .../{trunk => skia}/src/animator/SkDrawFull.h | 0 .../src/animator/SkDrawGradient.cpp | 0 .../src/animator/SkDrawGradient.h | 0 .../src/animator/SkDrawGroup.cpp | 0 .../src/animator/SkDrawGroup.h | 0 .../src/animator/SkDrawLine.cpp | 0 .../{trunk => skia}/src/animator/SkDrawLine.h | 0 .../src/animator/SkDrawMatrix.cpp | 0 .../src/animator/SkDrawMatrix.h | 0 .../src/animator/SkDrawOval.cpp | 0 .../{trunk => skia}/src/animator/SkDrawOval.h | 0 .../src/animator/SkDrawPaint.cpp | 0 .../src/animator/SkDrawPaint.h | 0 .../src/animator/SkDrawPath.cpp | 0 .../{trunk => skia}/src/animator/SkDrawPath.h | 0 .../src/animator/SkDrawPoint.cpp | 0 .../src/animator/SkDrawPoint.h | 0 .../src/animator/SkDrawRectangle.cpp | 0 .../src/animator/SkDrawRectangle.h | 0 .../src/animator/SkDrawSaveLayer.cpp | 0 .../src/animator/SkDrawSaveLayer.h | 0 .../src/animator/SkDrawShader.cpp | 0 .../src/animator/SkDrawShader.h | 0 .../src/animator/SkDrawText.cpp | 0 .../{trunk => skia}/src/animator/SkDrawText.h | 0 .../src/animator/SkDrawTextBox.cpp | 0 .../src/animator/SkDrawTextBox.h | 0 .../{trunk => skia}/src/animator/SkDrawTo.cpp | 0 .../{trunk => skia}/src/animator/SkDrawTo.h | 0 .../src/animator/SkDrawTransparentShader.cpp | 0 .../src/animator/SkDrawTransparentShader.h | 0 .../src/animator/SkDrawable.cpp | 0 .../{trunk => skia}/src/animator/SkDrawable.h | 0 .../{trunk => skia}/src/animator/SkDump.cpp | 0 .../{trunk => skia}/src/animator/SkDump.h | 0 .../src/animator/SkExtraPathEffects.xsd | 0 .../{trunk => skia}/src/animator/SkExtras.h | 0 .../src/animator/SkGetCondensedInfo.cpp | 0 .../src/animator/SkHitClear.cpp | 0 .../{trunk => skia}/src/animator/SkHitClear.h | 0 .../src/animator/SkHitTest.cpp | 0 .../{trunk => skia}/src/animator/SkHitTest.h | 0 .../{trunk => skia}/src/animator/SkIntArray.h | 0 .../src/animator/SkMatrixParts.cpp | 0 .../src/animator/SkMatrixParts.h | 0 .../src/animator/SkMemberInfo.cpp | 0 .../src/animator/SkMemberInfo.h | 0 .../src/animator/SkOpArray.cpp | 0 .../{trunk => skia}/src/animator/SkOpArray.h | 0 .../{trunk => skia}/src/animator/SkOperand.h | 0 .../{trunk => skia}/src/animator/SkOperand2.h | 0 .../src/animator/SkOperandInterpolator.h | 0 .../src/animator/SkOperandIterpolator.cpp | 0 .../src/animator/SkPaintPart.cpp | 0 .../src/animator/SkPaintPart.h | 0 .../src/animator/SkParseSVGPath.cpp | 0 .../src/animator/SkPathParts.cpp | 0 .../src/animator/SkPathParts.h | 0 .../src/animator/SkPostParts.cpp | 0 .../src/animator/SkPostParts.h | 0 .../{trunk => skia}/src/animator/SkScript.cpp | 0 .../{trunk => skia}/src/animator/SkScript.h | 0 .../{trunk => skia}/src/animator/SkScript2.h | 0 .../src/animator/SkScriptCallBack.h | 0 .../src/animator/SkScriptDecompile.cpp | 0 .../src/animator/SkScriptRuntime.cpp | 0 .../src/animator/SkScriptRuntime.h | 0 .../src/animator/SkScriptTokenizer.cpp | 0 .../src/animator/SkSnapshot.cpp | 0 .../{trunk => skia}/src/animator/SkSnapshot.h | 0 .../src/animator/SkTDArray_Experimental.h | 0 .../src/animator/SkTextOnPath.cpp | 0 .../src/animator/SkTextOnPath.h | 0 .../src/animator/SkTextToPath.cpp | 0 .../src/animator/SkTextToPath.h | 0 .../{trunk => skia}/src/animator/SkTime.cpp | 0 .../src/animator/SkTypedArray.cpp | 0 .../src/animator/SkTypedArray.h | 0 .../src/animator/SkXMLAnimatorWriter.cpp | 0 .../src/animator/SkXMLAnimatorWriter.h | 0 .../src/animator/thingstodo.txt | 0 .../{trunk => skia}/src/core/SkAAClip.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkAAClip.h | 0 .../src/core/SkAdvancedTypefaceMetrics.cpp | 0 .../{trunk => skia}/src/core/SkAlphaRuns.cpp | 0 .../{trunk => skia}/src/core/SkAnnotation.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkAntiRun.h | 0 .../{trunk => skia}/src/core/SkAutoKern.h | 0 .../{trunk => skia}/src/core/SkBBHFactory.cpp | 0 .../src/core/SkBBoxHierarchy.h | 0 .../src/core/SkBBoxHierarchyRecord.cpp | 0 .../src/core/SkBBoxHierarchyRecord.h | 0 .../{trunk => skia}/src/core/SkBBoxRecord.cpp | 0 .../{trunk => skia}/src/core/SkBBoxRecord.h | 0 .../{trunk => skia}/src/core/SkBitmap.cpp | 0 .../src/core/SkBitmapDevice.cpp | 0 .../src/core/SkBitmapFilter.cpp | 0 .../{trunk => skia}/src/core/SkBitmapFilter.h | 0 .../{trunk => skia}/src/core/SkBitmapHeap.cpp | 0 .../{trunk => skia}/src/core/SkBitmapHeap.h | 0 .../src/core/SkBitmapProcShader.cpp | 0 .../src/core/SkBitmapProcShader.h | 0 .../src/core/SkBitmapProcState.cpp | 0 .../src/core/SkBitmapProcState.h | 0 .../src/core/SkBitmapProcState_filter.h | 0 .../src/core/SkBitmapProcState_matrix.h | 0 .../core/SkBitmapProcState_matrixProcs.cpp | 0 .../core/SkBitmapProcState_matrix_template.h | 0 .../src/core/SkBitmapProcState_procs.h | 0 .../src/core/SkBitmapProcState_sample.h | 0 .../src/core/SkBitmapProcState_shaderproc.h | 0 .../src/core/SkBitmapProcState_utils.h | 0 .../src/core/SkBitmapScaler.cpp | 0 .../{trunk => skia}/src/core/SkBitmapScaler.h | 0 .../src/core/SkBitmap_scroll.cpp | 0 .../src/core/SkBlitBWMaskTemplate.h | 0 .../{trunk => skia}/src/core/SkBlitMask.h | 0 .../src/core/SkBlitMask_D32.cpp | 0 .../src/core/SkBlitRow_D16.cpp | 0 .../src/core/SkBlitRow_D32.cpp | 0 .../{trunk => skia}/src/core/SkBlitter.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkBlitter.h | 0 .../{trunk => skia}/src/core/SkBlitter_A8.cpp | 0 .../src/core/SkBlitter_ARGB32.cpp | 0 .../src/core/SkBlitter_RGB16.cpp | 0 .../src/core/SkBlitter_Sprite.cpp | 0 .../{trunk => skia}/src/core/SkBuffer.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkBuffer.h | 0 .../{trunk => skia}/src/core/SkCanvas.cpp | 0 .../{trunk => skia}/src/core/SkChecksum.h | 0 .../{trunk => skia}/src/core/SkChunkAlloc.cpp | 0 .../{trunk => skia}/src/core/SkClipStack.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkColor.cpp | 0 .../src/core/SkColorFilter.cpp | 0 .../{trunk => skia}/src/core/SkColorTable.cpp | 0 .../src/core/SkComposeShader.cpp | 0 .../{trunk => skia}/src/core/SkConfig8888.cpp | 0 .../{trunk => skia}/src/core/SkConfig8888.h | 0 .../{trunk => skia}/src/core/SkConvolver.cpp | 0 .../{trunk => skia}/src/core/SkConvolver.h | 0 .../{trunk => skia}/src/core/SkCoreBlitters.h | 0 .../src/core/SkCubicClipper.cpp | 0 .../{trunk => skia}/src/core/SkCubicClipper.h | 0 gfx/skia/{trunk => skia}/src/core/SkData.cpp | 0 .../{trunk => skia}/src/core/SkDataTable.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkDebug.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkDeque.cpp | 0 .../{trunk => skia}/src/core/SkDescriptor.h | 0 .../{trunk => skia}/src/core/SkDevice.cpp | 0 .../src/core/SkDeviceImageFilterProxy.h | 0 .../src/core/SkDeviceLooper.cpp | 0 .../{trunk => skia}/src/core/SkDeviceLooper.h | 0 .../src/core/SkDeviceProfile.cpp | 0 .../src/core/SkDeviceProfile.h | 0 .../src/core/SkDiscardableMemory.h | 0 .../src/core/SkDistanceFieldGen.cpp | 0 .../src/core/SkDistanceFieldGen.h | 0 .../{trunk => skia}/src/core/SkDither.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkDraw.cpp | 0 .../{trunk => skia}/src/core/SkDrawLooper.cpp | 0 .../{trunk => skia}/src/core/SkDrawProcs.h | 0 gfx/skia/{trunk => skia}/src/core/SkEdge.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkEdge.h | 0 .../src/core/SkEdgeBuilder.cpp | 0 .../{trunk => skia}/src/core/SkEdgeBuilder.h | 0 .../src/core/SkEdgeClipper.cpp | 0 .../{trunk => skia}/src/core/SkEdgeClipper.h | 0 .../{trunk => skia}/src/core/SkEmptyShader.h | 0 gfx/skia/{trunk => skia}/src/core/SkError.cpp | 0 .../src/core/SkErrorInternals.h | 0 gfx/skia/{trunk => skia}/src/core/SkFDot6.h | 0 .../{trunk => skia}/src/core/SkFilterProc.cpp | 0 .../{trunk => skia}/src/core/SkFilterProc.h | 0 .../src/core/SkFilterShader.cpp | 0 .../{trunk => skia}/src/core/SkFilterShader.h | 0 gfx/skia/{trunk => skia}/src/core/SkFlate.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkFlate.h | 0 .../src/core/SkFlattenable.cpp | 0 .../src/core/SkFlattenableSerialization.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkFloat.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkFloat.h | 0 .../{trunk => skia}/src/core/SkFloatBits.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkFont.cpp | 0 .../src/core/SkFontDescriptor.cpp | 0 .../src/core/SkFontDescriptor.h | 0 .../{trunk => skia}/src/core/SkFontHost.cpp | 0 .../{trunk => skia}/src/core/SkFontStream.cpp | 0 .../{trunk => skia}/src/core/SkFontStream.h | 0 .../{trunk => skia}/src/core/SkGeometry.cpp | 0 .../{trunk => skia}/src/core/SkGeometry.h | 0 gfx/skia/{trunk => skia}/src/core/SkGlyph.h | 0 .../{trunk => skia}/src/core/SkGlyphCache.cpp | 0 .../{trunk => skia}/src/core/SkGlyphCache.h | 0 .../src/core/SkGlyphCache_Globals.h | 0 .../{trunk => skia}/src/core/SkGraphics.cpp | 0 .../src/core/SkImageFilter.cpp | 0 .../src/core/SkImageGenerator.cpp | 0 .../src/core/SkImageGeneratorPriv.h | 0 .../{trunk => skia}/src/core/SkImageInfo.cpp | 0 .../{trunk => skia}/src/core/SkInstCnt.cpp | 0 .../{trunk => skia}/src/core/SkLazyFnPtr.h | 0 gfx/skia/{trunk => skia}/src/core/SkLazyPtr.h | 0 .../src/core/SkLineClipper.cpp | 0 .../{trunk => skia}/src/core/SkLineClipper.h | 0 .../src/core/SkLocalMatrixShader.cpp | 0 .../src/core/SkLocalMatrixShader.h | 0 .../src/core/SkMallocPixelRef.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkMask.cpp | 0 .../{trunk => skia}/src/core/SkMaskFilter.cpp | 0 .../{trunk => skia}/src/core/SkMaskGamma.cpp | 0 .../{trunk => skia}/src/core/SkMaskGamma.h | 0 gfx/skia/{trunk => skia}/src/core/SkMath.cpp | 0 .../{trunk => skia}/src/core/SkMathPriv.h | 0 .../{trunk => skia}/src/core/SkMatrix.cpp | 0 .../src/core/SkMatrixClipStateMgr.cpp | 0 .../src/core/SkMatrixClipStateMgr.h | 0 .../{trunk => skia}/src/core/SkMatrixUtils.h | 0 .../{trunk => skia}/src/core/SkMessageBus.h | 0 .../{trunk => skia}/src/core/SkMetaData.cpp | 0 .../{trunk => skia}/src/core/SkMipMap.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkMipMap.h | 0 .../src/core/SkOrderedReadBuffer.h | 0 .../{trunk => skia}/src/core/SkPackBits.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkPaint.cpp | 0 .../src/core/SkPaintDefaults.h | 0 .../src/core/SkPaintOptionsAndroid.cpp | 0 .../{trunk => skia}/src/core/SkPaintPriv.cpp | 0 .../{trunk => skia}/src/core/SkPaintPriv.h | 0 gfx/skia/{trunk => skia}/src/core/SkPatch.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkPath.cpp | 0 .../{trunk => skia}/src/core/SkPathEffect.cpp | 0 .../{trunk => skia}/src/core/SkPathHeap.cpp | 0 .../{trunk => skia}/src/core/SkPathHeap.h | 0 .../src/core/SkPathMeasure.cpp | 0 .../{trunk => skia}/src/core/SkPathRef.cpp | 0 .../{trunk => skia}/src/core/SkPerspIter.h | 0 .../{trunk => skia}/src/core/SkPicture.cpp | 0 .../src/core/SkPictureData.cpp | 0 .../{trunk => skia}/src/core/SkPictureData.h | 0 .../src/core/SkPictureFlat.cpp | 0 .../{trunk => skia}/src/core/SkPictureFlat.h | 0 .../src/core/SkPicturePlayback.cpp | 0 .../src/core/SkPicturePlayback.h | 0 .../src/core/SkPictureRangePlayback.cpp | 0 .../src/core/SkPictureRangePlayback.h | 0 .../src/core/SkPictureRecord.cpp | 0 .../src/core/SkPictureRecord.h | 0 .../src/core/SkPictureRecorder.cpp | 0 .../src/core/SkPictureReplacementPlayback.cpp | 0 .../src/core/SkPictureReplacementPlayback.h | 0 .../src/core/SkPictureShader.cpp | 0 .../src/core/SkPictureShader.h | 0 .../src/core/SkPictureStateTree.cpp | 0 .../src/core/SkPictureStateTree.h | 0 .../{trunk => skia}/src/core/SkPixelRef.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkPoint.cpp | 0 .../src/core/SkProcSpriteBlitter.cpp | 0 .../src/core/SkPtrRecorder.cpp | 0 .../{trunk => skia}/src/core/SkPtrRecorder.h | 0 .../src/core/SkQuadClipper.cpp | 0 .../{trunk => skia}/src/core/SkQuadClipper.h | 0 .../{trunk => skia}/src/core/SkQuadTree.cpp | 0 .../{trunk => skia}/src/core/SkQuadTree.h | 0 gfx/skia/{trunk => skia}/src/core/SkRRect.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkRTree.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkRTree.h | 0 .../{trunk => skia}/src/core/SkRasterClip.cpp | 0 .../{trunk => skia}/src/core/SkRasterClip.h | 0 .../{trunk => skia}/src/core/SkRasterizer.cpp | 0 .../{trunk => skia}/src/core/SkReadBuffer.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkRecord.h | 0 .../src/core/SkRecordAnalysis.cpp | 0 .../src/core/SkRecordAnalysis.h | 0 .../{trunk => skia}/src/core/SkRecordDraw.cpp | 0 .../{trunk => skia}/src/core/SkRecordDraw.h | 0 .../{trunk => skia}/src/core/SkRecordOpts.cpp | 0 .../{trunk => skia}/src/core/SkRecordOpts.h | 0 .../src/core/SkRecordPattern.h | 0 .../{trunk => skia}/src/core/SkRecorder.cpp | 0 .../{trunk => skia}/src/core/SkRecorder.h | 0 .../{trunk => skia}/src/core/SkRecording.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkRecords.h | 0 gfx/skia/{trunk => skia}/src/core/SkRect.cpp | 0 .../{trunk => skia}/src/core/SkRefDict.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkRefDict.h | 0 .../{trunk => skia}/src/core/SkRegion.cpp | 0 .../{trunk => skia}/src/core/SkRegionPriv.h | 0 .../src/core/SkRegion_path.cpp | 0 .../{trunk => skia}/src/core/SkSafeMath.h | 0 .../{trunk => skia}/src/core/SkScalar.cpp | 0 .../src/core/SkScaledImageCache.cpp | 0 .../src/core/SkScaledImageCache.h | 0 .../src/core/SkScalerContext.cpp | 0 .../src/core/SkScalerContext.h | 0 gfx/skia/{trunk => skia}/src/core/SkScan.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkScan.h | 0 .../{trunk => skia}/src/core/SkScanPriv.h | 0 .../src/core/SkScan_AntiPath.cpp | 0 .../src/core/SkScan_Antihair.cpp | 0 .../src/core/SkScan_Hairline.cpp | 0 .../{trunk => skia}/src/core/SkScan_Path.cpp | 0 .../{trunk => skia}/src/core/SkShader.cpp | 0 .../{trunk => skia}/src/core/SkSinTable.h | 0 .../src/core/SkSmallAllocator.h | 0 .../src/core/SkSpriteBlitter.h | 0 .../src/core/SkSpriteBlitterTemplate.h | 0 .../src/core/SkSpriteBlitter_ARGB32.cpp | 0 .../src/core/SkSpriteBlitter_RGB16.cpp | 0 .../{trunk => skia}/src/core/SkStream.cpp | 0 .../{trunk => skia}/src/core/SkStreamPriv.h | 0 .../{trunk => skia}/src/core/SkString.cpp | 0 .../src/core/SkStringUtils.cpp | 0 .../{trunk => skia}/src/core/SkStringUtils.h | 0 .../{trunk => skia}/src/core/SkStroke.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkStroke.h | 0 .../{trunk => skia}/src/core/SkStrokeRec.cpp | 0 .../src/core/SkStrokerPriv.cpp | 0 .../{trunk => skia}/src/core/SkStrokerPriv.h | 0 .../{trunk => skia}/src/core/SkTDynamicHash.h | 0 .../src/core/SkTInternalSList.h | 0 gfx/skia/{trunk => skia}/src/core/SkTLList.h | 0 gfx/skia/{trunk => skia}/src/core/SkTLS.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkTLS.h | 0 .../{trunk => skia}/src/core/SkTMultiMap.h | 0 .../{trunk => skia}/src/core/SkTObjectPool.h | 0 .../{trunk => skia}/src/core/SkTRefArray.h | 0 .../{trunk => skia}/src/core/SkTSearch.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkTSort.h | 0 .../src/core/SkTextFormatParams.h | 0 .../src/core/SkTextMapStateProc.h | 0 .../src/core/SkTextToPathIter.h | 0 .../{trunk => skia}/src/core/SkThreadPriv.h | 0 .../{trunk => skia}/src/core/SkTileGrid.cpp | 0 .../{trunk => skia}/src/core/SkTileGrid.h | 0 .../{trunk => skia}/src/core/SkTraceEvent.h | 0 .../{trunk => skia}/src/core/SkTypeface.cpp | 0 .../src/core/SkTypefaceCache.cpp | 0 .../src/core/SkTypefaceCache.h | 0 .../{trunk => skia}/src/core/SkTypefacePriv.h | 0 .../src/core/SkUnPreMultiply.cpp | 0 gfx/skia/{trunk => skia}/src/core/SkUtils.cpp | 0 .../{trunk => skia}/src/core/SkUtilsArm.cpp | 0 .../{trunk => skia}/src/core/SkUtilsArm.h | 0 .../src/core/SkValidatingReadBuffer.cpp | 0 .../src/core/SkValidatingReadBuffer.h | 0 .../src/core/SkValidationUtils.h | 0 .../{trunk => skia}/src/core/SkVertState.cpp | 0 .../{trunk => skia}/src/core/SkVertState.h | 0 .../src/core/SkWriteBuffer.cpp | 0 .../{trunk => skia}/src/core/SkWriter32.cpp | 0 .../{trunk => skia}/src/core/SkXfermode.cpp | 0 .../src/core/SkXfermode_proccoeff.h | 0 .../src/device/xps/SkXPSDevice.cpp | 0 .../{trunk => skia}/src/doc/SkDocument.cpp | 0 .../src/doc/SkDocument_PDF.cpp | 0 .../src/effects/Sk1DPathEffect.cpp | 0 .../src/effects/Sk2DPathEffect.cpp | 0 .../src/effects/SkAlphaThresholdFilter.cpp | 0 .../src/effects/SkArithmeticMode.cpp | 0 .../src/effects/SkAvoidXfermode.cpp | 0 .../src/effects/SkBitmapSource.cpp | 0 .../src/effects/SkBlurDrawLooper.cpp | 0 .../src/effects/SkBlurImageFilter.cpp | 0 .../src/effects/SkBlurMask.cpp | 0 .../{trunk => skia}/src/effects/SkBlurMask.h | 0 .../src/effects/SkBlurMaskFilter.cpp | 0 .../src/effects/SkColorFilterImageFilter.cpp | 0 .../src/effects/SkColorFilters.cpp | 0 .../src/effects/SkColorMatrix.cpp | 0 .../src/effects/SkColorMatrixFilter.cpp | 0 .../src/effects/SkComposeImageFilter.cpp | 0 .../src/effects/SkCornerPathEffect.cpp | 0 .../src/effects/SkDashPathEffect.cpp | 0 .../src/effects/SkDiscretePathEffect.cpp | 0 .../src/effects/SkDisplacementMapEffect.cpp | 0 .../src/effects/SkDropShadowImageFilter.cpp | 0 .../src/effects/SkEmbossMask.cpp | 0 .../src/effects/SkEmbossMask.h | 0 .../src/effects/SkEmbossMaskFilter.cpp | 0 .../src/effects/SkEmbossMask_Table.h | 0 .../src/effects/SkGpuBlurUtils.cpp | 0 .../src/effects/SkGpuBlurUtils.h | 0 .../src/effects/SkLayerDrawLooper.cpp | 0 .../src/effects/SkLayerRasterizer.cpp | 0 .../src/effects/SkLerpXfermode.cpp | 0 .../src/effects/SkLightingImageFilter.cpp | 0 .../src/effects/SkLumaColorFilter.cpp | 0 .../src/effects/SkMagnifierImageFilter.cpp | 0 .../SkMatrixConvolutionImageFilter.cpp | 0 .../src/effects/SkMatrixImageFilter.cpp | 0 .../src/effects/SkMergeImageFilter.cpp | 0 .../src/effects/SkMorphologyImageFilter.cpp | 0 .../src/effects/SkOffsetImageFilter.cpp | 0 .../src/effects/SkPaintFlagsDrawFilter.cpp | 0 .../src/effects/SkPerlinNoiseShader.cpp | 0 .../src/effects/SkPictureImageFilter.cpp | 0 .../src/effects/SkPixelXorXfermode.cpp | 0 .../src/effects/SkPorterDuff.cpp | 0 .../src/effects/SkRectShaderImageFilter.cpp | 0 .../src/effects/SkStippleMaskFilter.cpp | 0 .../src/effects/SkTableColorFilter.cpp | 0 .../src/effects/SkTableMaskFilter.cpp | 0 .../src/effects/SkTestImageFilters.cpp | 0 .../src/effects/SkTileImageFilter.cpp | 0 .../src/effects/SkTransparentShader.cpp | 0 .../src/effects/SkXfermodeImageFilter.cpp | 0 .../src/effects/gradients/SkBitmapCache.cpp | 0 .../src/effects/gradients/SkBitmapCache.h | 0 .../src/effects/gradients/SkClampRange.cpp | 0 .../src/effects/gradients/SkClampRange.h | 0 .../effects/gradients/SkGradientShader.cpp | 0 .../effects/gradients/SkGradientShaderPriv.h | 0 .../effects/gradients/SkLinearGradient.cpp | 0 .../src/effects/gradients/SkLinearGradient.h | 0 .../effects/gradients/SkRadialGradient.cpp | 0 .../src/effects/gradients/SkRadialGradient.h | 0 .../gradients/SkRadialGradient_Table.h | 0 .../src/effects/gradients/SkSweepGradient.cpp | 0 .../src/effects/gradients/SkSweepGradient.h | 0 .../gradients/SkTwoPointConicalGradient.cpp | 0 .../gradients/SkTwoPointConicalGradient.h | 0 .../SkTwoPointConicalGradient_gpu.cpp | 0 .../gradients/SkTwoPointConicalGradient_gpu.h | 0 .../gradients/SkTwoPointRadialGradient.cpp | 0 .../gradients/SkTwoPointRadialGradient.h | 0 .../src/fonts/SkFontMgr_fontconfig.cpp | 0 .../src/fonts/SkFontMgr_indirect.cpp | 0 .../src/fonts/SkGScalerContext.cpp | 0 .../src/fonts/SkGScalerContext.h | 0 .../src/fonts/SkRemotableFontMgr.cpp | 0 .../src/fonts/SkTestScalerContext.cpp | 0 .../src/fonts/SkTestScalerContext.h | 0 .../src/gpu/GrAAConvexPathRenderer.cpp | 0 .../src/gpu/GrAAConvexPathRenderer.h | 0 .../src/gpu/GrAAHairLinePathRenderer.cpp | 0 .../src/gpu/GrAAHairLinePathRenderer.h | 0 .../src/gpu/GrAARectRenderer.cpp | 0 .../src/gpu/GrAARectRenderer.h | 0 .../src/gpu/GrAddPathRenderers_default.cpp | 0 .../{trunk => skia}/src/gpu/GrAllocPool.cpp | 0 .../{trunk => skia}/src/gpu/GrAllocPool.h | 0 .../{trunk => skia}/src/gpu/GrAllocator.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrAtlas.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrAtlas.h | 0 .../{trunk => skia}/src/gpu/GrBinHashKey.h | 0 .../src/gpu/GrBitmapTextContext.cpp | 0 .../src/gpu/GrBitmapTextContext.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrBlend.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrBlend.h | 0 .../src/gpu/GrBufferAllocPool.cpp | 0 .../src/gpu/GrBufferAllocPool.h | 0 .../{trunk => skia}/src/gpu/GrCacheID.cpp | 0 .../{trunk => skia}/src/gpu/GrClipData.cpp | 0 .../src/gpu/GrClipMaskCache.cpp | 0 .../{trunk => skia}/src/gpu/GrClipMaskCache.h | 0 .../src/gpu/GrClipMaskManager.cpp | 0 .../src/gpu/GrClipMaskManager.h | 0 .../{trunk => skia}/src/gpu/GrContext.cpp | 0 .../src/gpu/GrDefaultPathRenderer.cpp | 0 .../src/gpu/GrDefaultPathRenderer.h | 0 .../src/gpu/GrDistanceFieldTextContext.cpp | 0 .../src/gpu/GrDistanceFieldTextContext.h | 0 .../{trunk => skia}/src/gpu/GrDrawState.cpp | 0 .../{trunk => skia}/src/gpu/GrDrawState.h | 0 .../{trunk => skia}/src/gpu/GrDrawTarget.cpp | 0 .../{trunk => skia}/src/gpu/GrDrawTarget.h | 0 .../src/gpu/GrDrawTargetCaps.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrEffect.cpp | 0 .../{trunk => skia}/src/gpu/GrFontScaler.cpp | 0 .../src/gpu/GrGeometryBuffer.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrGpu.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrGpu.h | 0 .../{trunk => skia}/src/gpu/GrGpuFactory.cpp | 0 .../{trunk => skia}/src/gpu/GrGpuResource.cpp | 0 .../src/gpu/GrInOrderDrawBuffer.cpp | 0 .../src/gpu/GrInOrderDrawBuffer.h | 0 .../{trunk => skia}/src/gpu/GrIndexBuffer.h | 0 .../{trunk => skia}/src/gpu/GrLayerCache.cpp | 0 .../{trunk => skia}/src/gpu/GrLayerCache.h | 0 .../{trunk => skia}/src/gpu/GrMemoryPool.cpp | 0 .../{trunk => skia}/src/gpu/GrMemoryPool.h | 0 .../{trunk => skia}/src/gpu/GrOrderedSet.h | 0 .../src/gpu/GrOvalRenderer.cpp | 0 .../{trunk => skia}/src/gpu/GrOvalRenderer.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrPaint.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrPath.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrPath.h | 0 .../{trunk => skia}/src/gpu/GrPathRange.h | 0 .../src/gpu/GrPathRenderer.cpp | 0 .../{trunk => skia}/src/gpu/GrPathRenderer.h | 0 .../src/gpu/GrPathRendererChain.cpp | 0 .../{trunk => skia}/src/gpu/GrPathUtils.cpp | 0 .../{trunk => skia}/src/gpu/GrPathUtils.h | 0 .../src/gpu/GrPictureUtils.cpp | 0 .../{trunk => skia}/src/gpu/GrPictureUtils.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrPlotMgr.h | 0 .../{trunk => skia}/src/gpu/GrRectanizer.h | 0 .../src/gpu/GrRectanizer_pow2.cpp | 0 .../src/gpu/GrRectanizer_pow2.h | 0 .../src/gpu/GrRectanizer_skyline.cpp | 0 .../src/gpu/GrRectanizer_skyline.h | 0 .../{trunk => skia}/src/gpu/GrRedBlackTree.h | 0 .../{trunk => skia}/src/gpu/GrReducedClip.cpp | 0 .../{trunk => skia}/src/gpu/GrReducedClip.h | 0 .../src/gpu/GrRenderTarget.cpp | 0 .../src/gpu/GrResourceCache.cpp | 0 .../{trunk => skia}/src/gpu/GrResourceCache.h | 0 .../src/gpu/GrSWMaskHelper.cpp | 0 .../{trunk => skia}/src/gpu/GrSWMaskHelper.h | 0 .../src/gpu/GrSoftwarePathRenderer.cpp | 0 .../src/gpu/GrSoftwarePathRenderer.h | 0 .../{trunk => skia}/src/gpu/GrStencil.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrStencil.h | 0 .../src/gpu/GrStencilAndCoverPathRenderer.cpp | 0 .../src/gpu/GrStencilAndCoverPathRenderer.h | 0 .../src/gpu/GrStencilAndCoverTextContext.cpp | 0 .../src/gpu/GrStencilAndCoverTextContext.h | 0 .../src/gpu/GrStencilBuffer.cpp | 0 .../{trunk => skia}/src/gpu/GrStencilBuffer.h | 0 .../{trunk => skia}/src/gpu/GrStrokeInfo.h | 0 .../{trunk => skia}/src/gpu/GrSurface.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrTBSearch.h | 0 .../{trunk => skia}/src/gpu/GrTHashTable.h | 0 .../{trunk => skia}/src/gpu/GrTemplates.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrTest.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/GrTest.h | 0 .../{trunk => skia}/src/gpu/GrTextContext.cpp | 0 .../{trunk => skia}/src/gpu/GrTextContext.h | 0 .../{trunk => skia}/src/gpu/GrTextStrike.cpp | 0 .../{trunk => skia}/src/gpu/GrTextStrike.h | 0 .../src/gpu/GrTextStrike_impl.h | 0 .../{trunk => skia}/src/gpu/GrTexture.cpp | 0 .../src/gpu/GrTextureAccess.cpp | 0 .../{trunk => skia}/src/gpu/GrTraceMarker.cpp | 0 .../{trunk => skia}/src/gpu/GrTraceMarker.h | 0 gfx/skia/{trunk => skia}/src/gpu/GrTracing.h | 0 .../{trunk => skia}/src/gpu/GrVertexBuffer.h | 0 .../{trunk => skia}/src/gpu/SkGpuDevice.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/SkGr.cpp | 0 .../{trunk => skia}/src/gpu/SkGrPixelRef.cpp | 0 .../src/gpu/SkGrTexturePixelRef.cpp | 0 .../src/gpu/effects/Gr1DKernelEffect.h | 0 .../src/gpu/effects/GrBezierEffect.cpp | 0 .../src/gpu/effects/GrBezierEffect.h | 0 .../src/gpu/effects/GrBicubicEffect.cpp | 0 .../src/gpu/effects/GrBicubicEffect.h | 0 .../gpu/effects/GrConfigConversionEffect.cpp | 0 .../gpu/effects/GrConfigConversionEffect.h | 0 .../src/gpu/effects/GrConvexPolyEffect.cpp | 0 .../src/gpu/effects/GrConvexPolyEffect.h | 0 .../src/gpu/effects/GrConvolutionEffect.cpp | 0 .../src/gpu/effects/GrConvolutionEffect.h | 0 .../effects/GrCustomCoordsTextureEffect.cpp | 0 .../gpu/effects/GrCustomCoordsTextureEffect.h | 0 .../src/gpu/effects/GrDashingEffect.cpp | 0 .../src/gpu/effects/GrDashingEffect.h | 0 .../effects/GrDistanceFieldTextureEffect.cpp | 0 .../effects/GrDistanceFieldTextureEffect.h | 0 .../src/gpu/effects/GrDitherEffect.cpp | 0 .../src/gpu/effects/GrDitherEffect.h | 0 .../gpu/effects/GrMatrixConvolutionEffect.cpp | 0 .../gpu/effects/GrMatrixConvolutionEffect.h | 0 .../src/gpu/effects/GrOvalEffect.cpp | 0 .../src/gpu/effects/GrOvalEffect.h | 0 .../src/gpu/effects/GrRRectEffect.cpp | 0 .../src/gpu/effects/GrRRectEffect.h | 0 .../src/gpu/effects/GrSimpleTextureEffect.cpp | 0 .../src/gpu/effects/GrSimpleTextureEffect.h | 0 .../src/gpu/effects/GrSingleTextureEffect.cpp | 0 .../src/gpu/effects/GrSingleTextureEffect.h | 0 .../src/gpu/effects/GrTextureDomain.cpp | 0 .../src/gpu/effects/GrTextureDomain.h | 0 .../src/gpu/effects/GrTextureStripAtlas.cpp | 0 .../src/gpu/effects/GrTextureStripAtlas.h | 0 .../src/gpu/effects/GrVertexEffect.h | 0 .../src/gpu/effects/GrYUVtoRGBEffect.cpp | 0 .../src/gpu/effects/GrYUVtoRGBEffect.h | 0 .../src/gpu/gl/GrGLAssembleGLESInterface.h | 0 .../src/gpu/gl/GrGLAssembleInterface.cpp | 0 .../src/gpu/gl/GrGLAssembleInterface.h | 0 .../src/gpu/gl/GrGLBufferImpl.cpp | 0 .../src/gpu/gl/GrGLBufferImpl.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLCaps.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLCaps.h | 0 .../src/gpu/gl/GrGLContext.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLContext.h | 0 .../gpu/gl/GrGLCreateNativeInterface_none.cpp | 0 .../src/gpu/gl/GrGLCreateNullInterface.cpp | 0 .../gpu/gl/GrGLDefaultInterface_native.cpp | 0 .../src/gpu/gl/GrGLDefaultInterface_none.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLDefines.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLEffect.h | 0 .../src/gpu/gl/GrGLExtensions.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLIRect.h | 0 .../src/gpu/gl/GrGLIndexBuffer.cpp | 0 .../src/gpu/gl/GrGLIndexBuffer.h | 0 .../src/gpu/gl/GrGLInterface.cpp | 0 .../src/gpu/gl/GrGLNameAllocator.cpp | 0 .../src/gpu/gl/GrGLNameAllocator.h | 0 .../src/gpu/gl/GrGLNoOpInterface.cpp | 0 .../src/gpu/gl/GrGLNoOpInterface.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLPath.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLPath.h | 0 .../src/gpu/gl/GrGLPathRange.cpp | 0 .../src/gpu/gl/GrGLPathRange.h | 0 .../src/gpu/gl/GrGLProgram.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLProgram.h | 0 .../src/gpu/gl/GrGLProgramDesc.cpp | 0 .../src/gpu/gl/GrGLProgramDesc.h | 0 .../src/gpu/gl/GrGLProgramEffects.cpp | 0 .../src/gpu/gl/GrGLProgramEffects.h | 0 .../src/gpu/gl/GrGLRenderTarget.cpp | 0 .../src/gpu/gl/GrGLRenderTarget.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLSL.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/gl/GrGLSL.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLSL_impl.h | 0 .../src/gpu/gl/GrGLShaderBuilder.cpp | 0 .../src/gpu/gl/GrGLShaderBuilder.h | 0 .../src/gpu/gl/GrGLShaderVar.h | 0 .../src/gpu/gl/GrGLStencilBuffer.cpp | 0 .../src/gpu/gl/GrGLStencilBuffer.h | 0 .../src/gpu/gl/GrGLTexture.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLTexture.h | 0 .../src/gpu/gl/GrGLUniformHandle.h | 0 .../src/gpu/gl/GrGLUniformManager.cpp | 0 .../src/gpu/gl/GrGLUniformManager.h | 0 .../{trunk => skia}/src/gpu/gl/GrGLUtil.cpp | 0 .../{trunk => skia}/src/gpu/gl/GrGLUtil.h | 0 .../src/gpu/gl/GrGLVertexArray.cpp | 0 .../src/gpu/gl/GrGLVertexArray.h | 0 .../src/gpu/gl/GrGLVertexBuffer.cpp | 0 .../src/gpu/gl/GrGLVertexBuffer.h | 0 .../src/gpu/gl/GrGLVertexEffect.h | 0 .../{trunk => skia}/src/gpu/gl/GrGpuGL.cpp | 0 gfx/skia/{trunk => skia}/src/gpu/gl/GrGpuGL.h | 0 .../src/gpu/gl/GrGpuGL_program.cpp | 0 .../src/gpu/gl/SkGLContextHelper.cpp | 0 .../src/gpu/gl/SkNullGLContext.cpp | 0 .../GrGLCreateNativeInterface_android.cpp | 0 .../gl/android/SkNativeGLContext_android.cpp | 0 .../gpu/gl/angle/GrGLCreateANGLEInterface.cpp | 0 .../src/gpu/gl/angle/SkANGLEGLContext.cpp | 0 .../src/gpu/gl/debug/GrBufferObj.cpp | 0 .../src/gpu/gl/debug/GrBufferObj.h | 0 .../src/gpu/gl/debug/GrDebugGL.cpp | 0 .../src/gpu/gl/debug/GrDebugGL.h | 0 .../src/gpu/gl/debug/GrFBBindableObj.h | 0 .../src/gpu/gl/debug/GrFakeRefObj.h | 0 .../src/gpu/gl/debug/GrFrameBufferObj.cpp | 0 .../src/gpu/gl/debug/GrFrameBufferObj.h | 0 .../gpu/gl/debug/GrGLCreateDebugInterface.cpp | 0 .../src/gpu/gl/debug/GrProgramObj.cpp | 0 .../src/gpu/gl/debug/GrProgramObj.h | 0 .../src/gpu/gl/debug/GrRenderBufferObj.h | 0 .../src/gpu/gl/debug/GrShaderObj.cpp | 0 .../src/gpu/gl/debug/GrShaderObj.h | 0 .../src/gpu/gl/debug/GrTextureObj.cpp | 0 .../src/gpu/gl/debug/GrTextureObj.h | 0 .../src/gpu/gl/debug/GrTextureUnitObj.cpp | 0 .../src/gpu/gl/debug/GrTextureUnitObj.h | 0 .../src/gpu/gl/debug/GrVertexArrayObj.h | 0 .../src/gpu/gl/debug/SkDebugGLContext.cpp | 0 .../gl/iOS/GrGLCreateNativeInterface_iOS.cpp | 0 .../src/gpu/gl/iOS/SkNativeGLContext_iOS.mm | 0 .../gl/mac/GrGLCreateNativeInterface_mac.cpp | 0 .../src/gpu/gl/mac/SkNativeGLContext_mac.cpp | 0 .../gpu/gl/mesa/GrGLCreateMesaInterface.cpp | 0 .../src/gpu/gl/mesa/SkMesaGLContext.cpp | 0 .../src/gpu/gl/mesa/osmesa_wrapper.h | 0 .../gpu/gl/nacl/SkNativeGLContext_nacl.cpp | 0 .../unix/GrGLCreateNativeInterface_unix.cpp | 0 .../gpu/gl/unix/SkNativeGLContext_unix.cpp | 0 .../gl/win/GrGLCreateNativeInterface_win.cpp | 0 .../src/gpu/gl/win/SkNativeGLContext_win.cpp | 0 .../{trunk => skia}/src/image/SkImage.cpp | 0 .../{trunk => skia}/src/image/SkImagePriv.cpp | 0 .../{trunk => skia}/src/image/SkImagePriv.h | 0 .../{trunk => skia}/src/image/SkImage_Base.h | 0 .../src/image/SkImage_Codec.cpp | 0 .../{trunk => skia}/src/image/SkImage_Gpu.cpp | 0 .../src/image/SkImage_Raster.cpp | 0 .../{trunk => skia}/src/image/SkSurface.cpp | 0 .../src/image/SkSurface_Base.h | 0 .../src/image/SkSurface_Gpu.cpp | 0 .../src/image/SkSurface_Raster.cpp | 0 .../src/images/SkDecodingImageGenerator.cpp | 0 .../src/images/SkForceLinking.cpp | 0 .../src/images/SkImageDecoder.cpp | 0 .../images/SkImageDecoder_FactoryDefault.cpp | 0 .../SkImageDecoder_FactoryRegistrar.cpp | 0 .../src/images/SkImageDecoder_ktx.cpp | 0 .../src/images/SkImageDecoder_libbmp.cpp | 0 .../src/images/SkImageDecoder_libgif.cpp | 0 .../src/images/SkImageDecoder_libico.cpp | 0 .../src/images/SkImageDecoder_libjpeg.cpp | 0 .../src/images/SkImageDecoder_libpng.cpp | 0 .../src/images/SkImageDecoder_libwebp.cpp | 0 .../src/images/SkImageDecoder_pkm.cpp | 0 .../src/images/SkImageDecoder_wbmp.cpp | 0 .../src/images/SkImageEncoder.cpp | 0 .../src/images/SkImageEncoder_Factory.cpp | 0 .../src/images/SkImageEncoder_argb.cpp | 0 .../src/images/SkJpegUtility.cpp | 0 .../src/images/SkJpegUtility.h | 0 .../{trunk => skia}/src/images/SkMovie.cpp | 0 .../src/images/SkMovie_gif.cpp | 0 .../src/images/SkPageFlipper.cpp | 0 .../src/images/SkScaledBitmapSampler.cpp | 0 .../src/images/SkScaledBitmapSampler.h | 0 .../src/images/bmpdecoderhelper.cpp | 0 .../src/images/bmpdecoderhelper.h | 0 .../src/images/transform_scanline.h | 0 .../src/lazy/SkCachingPixelRef.cpp | 0 .../src/lazy/SkCachingPixelRef.h | 0 .../src/lazy/SkDiscardableMemoryPool.cpp | 0 .../src/lazy/SkDiscardableMemoryPool.h | 0 .../src/lazy/SkDiscardablePixelRef.cpp | 0 .../src/lazy/SkDiscardablePixelRef.h | 0 .../src/opts/SkBitmapFilter_opts_SSE2.cpp | 0 .../src/opts/SkBitmapFilter_opts_SSE2.h | 0 .../src/opts/SkBitmapProcState_arm_neon.cpp | 0 .../src/opts/SkBitmapProcState_filter_neon.h | 0 .../SkBitmapProcState_matrixProcs_neon.cpp | 0 .../src/opts/SkBitmapProcState_matrix_neon.h | 0 .../src/opts/SkBitmapProcState_opts_SSE2.cpp | 0 .../src/opts/SkBitmapProcState_opts_SSE2.h | 0 .../src/opts/SkBitmapProcState_opts_SSSE3.cpp | 0 .../src/opts/SkBitmapProcState_opts_SSSE3.h | 0 .../src/opts/SkBitmapProcState_opts_arm.cpp | 0 .../opts/SkBitmapProcState_opts_mips_dsp.cpp | 0 .../src/opts/SkBitmapProcState_opts_none.cpp | 0 .../src/opts/SkBlitMask_opts_arm.cpp | 0 .../src/opts/SkBlitMask_opts_arm_neon.cpp | 0 .../src/opts/SkBlitMask_opts_arm_neon.h | 0 .../src/opts/SkBlitMask_opts_none.cpp | 0 .../src/opts/SkBlitRect_opts_SSE2.cpp | 0 .../src/opts/SkBlitRect_opts_SSE2.h | 0 .../src/opts/SkBlitRow_opts_SSE2.cpp | 0 .../src/opts/SkBlitRow_opts_SSE2.h | 0 .../src/opts/SkBlitRow_opts_SSE4.h | 0 .../src/opts/SkBlitRow_opts_SSE4_asm.S | 0 .../src/opts/SkBlitRow_opts_SSE4_x64_asm.S | 0 .../src/opts/SkBlitRow_opts_arm.cpp | 0 .../src/opts/SkBlitRow_opts_arm_neon.cpp | 0 .../src/opts/SkBlitRow_opts_arm_neon.h | 0 .../src/opts/SkBlitRow_opts_mips_dsp.cpp | 0 .../src/opts/SkBlitRow_opts_none.cpp | 0 .../src/opts/SkBlurImage_opts.h | 0 .../src/opts/SkBlurImage_opts_SSE2.cpp | 0 .../src/opts/SkBlurImage_opts_SSE2.h | 0 .../src/opts/SkBlurImage_opts_SSE4.cpp | 0 .../src/opts/SkBlurImage_opts_SSE4.h | 0 .../src/opts/SkBlurImage_opts_arm.cpp | 0 .../src/opts/SkBlurImage_opts_neon.cpp | 0 .../src/opts/SkBlurImage_opts_neon.h | 0 .../src/opts/SkBlurImage_opts_none.cpp | 0 .../src/opts/SkColor_opts_SSE2.h | 0 .../src/opts/SkColor_opts_neon.h | 0 .../src/opts/SkMath_opts_SSE2.h | 0 .../src/opts/SkMorphology_opts.h | 0 .../src/opts/SkMorphology_opts_SSE2.cpp | 0 .../src/opts/SkMorphology_opts_SSE2.h | 0 .../src/opts/SkMorphology_opts_arm.cpp | 0 .../src/opts/SkMorphology_opts_neon.cpp | 0 .../src/opts/SkMorphology_opts_neon.h | 0 .../src/opts/SkMorphology_opts_none.cpp | 0 .../src/opts/SkTextureCompression_opts.h | 0 .../opts/SkTextureCompression_opts_arm.cpp | 0 .../opts/SkTextureCompression_opts_neon.cpp | 0 .../src/opts/SkTextureCompression_opts_neon.h | 0 .../opts/SkTextureCompression_opts_none.cpp | 0 .../src/opts/SkUtils_opts_SSE2.cpp | 0 .../src/opts/SkUtils_opts_SSE2.h | 0 .../src/opts/SkUtils_opts_arm.cpp | 0 .../src/opts/SkUtils_opts_none.cpp | 0 .../src/opts/SkXfermode_opts_SSE2.cpp | 0 .../src/opts/SkXfermode_opts_SSE2.h | 0 .../src/opts/SkXfermode_opts_arm.cpp | 0 .../src/opts/SkXfermode_opts_arm_neon.cpp | 0 .../src/opts/SkXfermode_opts_arm_neon.h | 0 .../src/opts/SkXfermode_opts_none.cpp | 0 .../{trunk => skia}/src/opts/memset.arm.S | 0 .../{trunk => skia}/src/opts/memset16_neon.S | 0 .../{trunk => skia}/src/opts/memset32_neon.S | 0 .../src/opts/opts_check_x86.cpp | 0 .../src/pathops/SkAddIntersections.cpp | 0 .../src/pathops/SkAddIntersections.h | 0 .../src/pathops/SkDCubicIntersection.cpp | 0 .../src/pathops/SkDCubicLineIntersection.cpp | 0 .../src/pathops/SkDCubicToQuads.cpp | 0 .../src/pathops/SkDLineIntersection.cpp | 0 .../src/pathops/SkDQuadImplicit.cpp | 0 .../src/pathops/SkDQuadImplicit.h | 0 .../src/pathops/SkDQuadIntersection.cpp | 0 .../src/pathops/SkDQuadLineIntersection.cpp | 0 .../src/pathops/SkIntersectionHelper.h | 0 .../src/pathops/SkIntersections.cpp | 0 .../src/pathops/SkIntersections.h | 0 .../src/pathops/SkLineParameters.h | 0 .../{trunk => skia}/src/pathops/SkOpAngle.cpp | 0 .../{trunk => skia}/src/pathops/SkOpAngle.h | 0 .../src/pathops/SkOpContour.cpp | 0 .../{trunk => skia}/src/pathops/SkOpContour.h | 0 .../src/pathops/SkOpEdgeBuilder.cpp | 0 .../src/pathops/SkOpEdgeBuilder.h | 0 .../src/pathops/SkOpSegment.cpp | 0 .../{trunk => skia}/src/pathops/SkOpSegment.h | 0 .../{trunk => skia}/src/pathops/SkOpSpan.h | 0 .../src/pathops/SkPathOpsBounds.cpp | 0 .../src/pathops/SkPathOpsBounds.h | 0 .../src/pathops/SkPathOpsCommon.cpp | 0 .../src/pathops/SkPathOpsCommon.h | 0 .../src/pathops/SkPathOpsCubic.cpp | 0 .../src/pathops/SkPathOpsCubic.h | 0 .../src/pathops/SkPathOpsCurve.h | 0 .../src/pathops/SkPathOpsDebug.cpp | 0 .../src/pathops/SkPathOpsDebug.h | 0 .../src/pathops/SkPathOpsLine.cpp | 0 .../src/pathops/SkPathOpsLine.h | 0 .../src/pathops/SkPathOpsOp.cpp | 0 .../src/pathops/SkPathOpsPoint.cpp | 0 .../src/pathops/SkPathOpsPoint.h | 0 .../src/pathops/SkPathOpsQuad.cpp | 0 .../src/pathops/SkPathOpsQuad.h | 0 .../src/pathops/SkPathOpsRect.cpp | 0 .../src/pathops/SkPathOpsRect.h | 0 .../src/pathops/SkPathOpsSimplify.cpp | 0 .../src/pathops/SkPathOpsTightBounds.cpp | 0 .../src/pathops/SkPathOpsTriangle.cpp | 0 .../src/pathops/SkPathOpsTriangle.h | 0 .../src/pathops/SkPathOpsTypes.cpp | 0 .../src/pathops/SkPathOpsTypes.h | 0 .../src/pathops/SkPathWriter.cpp | 0 .../src/pathops/SkPathWriter.h | 0 .../src/pathops/SkQuarticRoot.cpp | 0 .../src/pathops/SkQuarticRoot.h | 0 .../src/pathops/SkReduceOrder.cpp | 0 .../src/pathops/SkReduceOrder.h | 0 .../{trunk => skia}/src/pdf/SkPDFCatalog.cpp | 0 .../{trunk => skia}/src/pdf/SkPDFCatalog.h | 0 .../{trunk => skia}/src/pdf/SkPDFDevice.cpp | 0 .../src/pdf/SkPDFDeviceFlattener.cpp | 0 .../src/pdf/SkPDFDeviceFlattener.h | 0 .../{trunk => skia}/src/pdf/SkPDFDocument.cpp | 0 .../{trunk => skia}/src/pdf/SkPDFFont.cpp | 0 gfx/skia/{trunk => skia}/src/pdf/SkPDFFont.h | 0 .../{trunk => skia}/src/pdf/SkPDFFontImpl.h | 0 .../src/pdf/SkPDFFormXObject.cpp | 0 .../src/pdf/SkPDFFormXObject.h | 0 .../src/pdf/SkPDFGraphicState.cpp | 0 .../src/pdf/SkPDFGraphicState.h | 0 .../{trunk => skia}/src/pdf/SkPDFImage.cpp | 0 gfx/skia/{trunk => skia}/src/pdf/SkPDFImage.h | 0 .../{trunk => skia}/src/pdf/SkPDFPage.cpp | 0 gfx/skia/{trunk => skia}/src/pdf/SkPDFPage.h | 0 .../src/pdf/SkPDFResourceDict.cpp | 0 .../src/pdf/SkPDFResourceDict.h | 0 .../{trunk => skia}/src/pdf/SkPDFShader.cpp | 0 .../{trunk => skia}/src/pdf/SkPDFShader.h | 0 .../{trunk => skia}/src/pdf/SkPDFStream.cpp | 0 .../{trunk => skia}/src/pdf/SkPDFStream.h | 0 .../{trunk => skia}/src/pdf/SkPDFTypes.cpp | 0 gfx/skia/{trunk => skia}/src/pdf/SkPDFTypes.h | 0 .../{trunk => skia}/src/pdf/SkPDFUtils.cpp | 0 gfx/skia/{trunk => skia}/src/pdf/SkPDFUtils.h | 0 gfx/skia/{trunk => skia}/src/pdf/SkTSet.h | 0 .../{trunk => skia}/src/pipe/SkGPipePriv.h | 0 .../{trunk => skia}/src/pipe/SkGPipeRead.cpp | 0 .../{trunk => skia}/src/pipe/SkGPipeWrite.cpp | 0 .../src/pipe/utils/SamplePipeControllers.cpp | 0 .../src/pipe/utils/SamplePipeControllers.h | 0 .../src/ports/SkAtomics_sync.h | 0 .../{trunk => skia}/src/ports/SkAtomics_win.h | 0 .../src/ports/SkBarriers_arm.h | 0 .../src/ports/SkBarriers_tsan.h | 0 .../src/ports/SkBarriers_x86.h | 0 .../src/ports/SkDebug_android.cpp | 0 .../src/ports/SkDebug_nacl.cpp | 0 .../src/ports/SkDebug_stdio.cpp | 0 .../{trunk => skia}/src/ports/SkDebug_win.cpp | 0 .../src/ports/SkDiscardableMemory_none.cpp | 0 .../ports/SkFontConfigInterface_android.cpp | 0 .../ports/SkFontConfigInterface_direct.cpp | 0 .../src/ports/SkFontConfigParser_android.cpp | 0 .../src/ports/SkFontConfigParser_android.h | 0 .../src/ports/SkFontConfigTypeface.h | 0 .../src/ports/SkFontHost_FreeType.cpp | 0 .../src/ports/SkFontHost_FreeType_common.cpp | 0 .../src/ports/SkFontHost_FreeType_common.h | 0 .../src/ports/SkFontHost_android_old.cpp | 0 .../src/ports/SkFontHost_cairo.cpp | 0 .../src/ports/SkFontHost_fontconfig.cpp | 0 .../src/ports/SkFontHost_linux.cpp | 0 .../src/ports/SkFontHost_mac.cpp | 0 .../src/ports/SkFontHost_none.cpp | 0 .../src/ports/SkFontHost_win.cpp | 0 .../src/ports/SkFontMgr_android.cpp | 0 .../src/ports/SkFontMgr_default_dw.cpp | 0 .../src/ports/SkFontMgr_default_gdi.cpp | 0 .../src/ports/SkFontMgr_win_dw.cpp | 0 .../ports/SkGlobalInitialization_chromium.cpp | 0 .../ports/SkGlobalInitialization_default.cpp | 0 .../src/ports/SkImageDecoder_CG.cpp | 0 .../src/ports/SkImageDecoder_WIC.cpp | 0 .../src/ports/SkImageDecoder_empty.cpp | 0 .../src/ports/SkMemory_malloc.cpp | 0 .../src/ports/SkMemory_mozalloc.cpp | 0 .../src/ports/SkMutex_pthread.h | 0 .../{trunk => skia}/src/ports/SkMutex_win.h | 0 .../src/ports/SkOSFile_none.cpp | 0 .../src/ports/SkOSFile_posix.cpp | 0 .../src/ports/SkOSFile_stdio.cpp | 0 .../src/ports/SkOSFile_win.cpp | 0 .../src/ports/SkRemotableFontMgr_win_dw.cpp | 0 .../src/ports/SkScalerContext_win_dw.cpp | 0 .../src/ports/SkScalerContext_win_dw.h | 0 .../{trunk => skia}/src/ports/SkTLS_none.cpp | 0 .../src/ports/SkTLS_pthread.cpp | 0 .../{trunk => skia}/src/ports/SkTLS_win.cpp | 0 .../{trunk => skia}/src/ports/SkTime_Unix.cpp | 0 .../{trunk => skia}/src/ports/SkTime_win.cpp | 0 .../src/ports/SkTypeface_win_dw.cpp | 0 .../src/ports/SkTypeface_win_dw.h | 0 .../src/ports/SkXMLParser_empty.cpp | 0 .../src/sfnt/SkIBMFamilyClass.h | 0 .../{trunk => skia}/src/sfnt/SkOTTableTypes.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_EBDT.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_EBLC.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_EBSC.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_OS_2.h | 0 .../src/sfnt/SkOTTable_OS_2_V0.h | 0 .../src/sfnt/SkOTTable_OS_2_V1.h | 0 .../src/sfnt/SkOTTable_OS_2_V2.h | 0 .../src/sfnt/SkOTTable_OS_2_V3.h | 0 .../src/sfnt/SkOTTable_OS_2_V4.h | 0 .../src/sfnt/SkOTTable_OS_2_VA.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_gasp.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_glyf.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_head.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_hhea.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_loca.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_maxp.h | 0 .../src/sfnt/SkOTTable_maxp_CFF.h | 0 .../src/sfnt/SkOTTable_maxp_TT.h | 0 .../src/sfnt/SkOTTable_name.cpp | 0 .../{trunk => skia}/src/sfnt/SkOTTable_name.h | 0 .../{trunk => skia}/src/sfnt/SkOTTable_post.h | 0 .../{trunk => skia}/src/sfnt/SkOTUtils.cpp | 0 gfx/skia/{trunk => skia}/src/sfnt/SkOTUtils.h | 0 gfx/skia/{trunk => skia}/src/sfnt/SkPanose.h | 0 .../src/sfnt/SkPreprocessorSeq.h | 0 .../{trunk => skia}/src/sfnt/SkSFNTHeader.h | 0 .../{trunk => skia}/src/sfnt/SkTTCFHeader.h | 0 .../{trunk => skia}/src/sfnt/SkTypedEnum.h | 0 gfx/skia/{trunk => skia}/src/svg/SkSVG.cpp | 0 .../{trunk => skia}/src/svg/SkSVGCircle.cpp | 0 .../{trunk => skia}/src/svg/SkSVGCircle.h | 0 .../{trunk => skia}/src/svg/SkSVGClipPath.cpp | 0 .../{trunk => skia}/src/svg/SkSVGClipPath.h | 0 .../{trunk => skia}/src/svg/SkSVGDefs.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGDefs.h | 0 .../{trunk => skia}/src/svg/SkSVGElements.cpp | 0 .../{trunk => skia}/src/svg/SkSVGElements.h | 0 .../{trunk => skia}/src/svg/SkSVGEllipse.cpp | 0 .../{trunk => skia}/src/svg/SkSVGEllipse.h | 0 .../src/svg/SkSVGFeColorMatrix.cpp | 0 .../src/svg/SkSVGFeColorMatrix.h | 0 .../{trunk => skia}/src/svg/SkSVGFilter.cpp | 0 .../{trunk => skia}/src/svg/SkSVGFilter.h | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGG.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGG.h | 0 .../{trunk => skia}/src/svg/SkSVGGradient.cpp | 0 .../{trunk => skia}/src/svg/SkSVGGradient.h | 0 .../{trunk => skia}/src/svg/SkSVGGroup.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGGroup.h | 0 .../{trunk => skia}/src/svg/SkSVGImage.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGImage.h | 0 .../{trunk => skia}/src/svg/SkSVGLine.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGLine.h | 0 .../src/svg/SkSVGLinearGradient.cpp | 0 .../src/svg/SkSVGLinearGradient.h | 0 .../{trunk => skia}/src/svg/SkSVGMask.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGMask.h | 0 .../{trunk => skia}/src/svg/SkSVGMetadata.cpp | 0 .../{trunk => skia}/src/svg/SkSVGMetadata.h | 0 .../src/svg/SkSVGPaintState.cpp | 0 .../{trunk => skia}/src/svg/SkSVGParser.cpp | 0 .../{trunk => skia}/src/svg/SkSVGPath.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGPath.h | 0 .../{trunk => skia}/src/svg/SkSVGPolygon.cpp | 0 .../{trunk => skia}/src/svg/SkSVGPolygon.h | 0 .../{trunk => skia}/src/svg/SkSVGPolyline.cpp | 0 .../{trunk => skia}/src/svg/SkSVGPolyline.h | 0 .../src/svg/SkSVGRadialGradient.cpp | 0 .../src/svg/SkSVGRadialGradient.h | 0 .../{trunk => skia}/src/svg/SkSVGRect.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGRect.h | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGSVG.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGSVG.h | 0 .../{trunk => skia}/src/svg/SkSVGStop.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGStop.h | 0 .../{trunk => skia}/src/svg/SkSVGSymbol.cpp | 0 .../{trunk => skia}/src/svg/SkSVGSymbol.h | 0 .../{trunk => skia}/src/svg/SkSVGText.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGText.h | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGUse.cpp | 0 gfx/skia/{trunk => skia}/src/svg/SkSVGUse.h | 0 .../{trunk => skia}/src/utils/SkBase64.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkBase64.h | 0 .../{trunk => skia}/src/utils/SkBitSet.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkBitSet.h | 0 .../src/utils/SkBitmapHasher.cpp | 0 .../src/utils/SkBitmapHasher.h | 0 .../src/utils/SkBoundaryPatch.cpp | 0 .../{trunk => skia}/src/utils/SkCamera.cpp | 0 .../src/utils/SkCanvasStack.cpp | 0 .../{trunk => skia}/src/utils/SkCanvasStack.h | 0 .../src/utils/SkCanvasStateUtils.cpp | 0 .../{trunk => skia}/src/utils/SkCondVar.cpp | 0 .../src/utils/SkCubicInterval.cpp | 0 .../src/utils/SkCullPoints.cpp | 0 .../{trunk => skia}/src/utils/SkDashPath.cpp | 0 .../src/utils/SkDashPathPriv.h | 0 .../src/utils/SkDeferredCanvas.cpp | 0 .../src/utils/SkDumpCanvas.cpp | 0 .../src/utils/SkEventTracer.cpp | 0 .../{trunk => skia}/src/utils/SkFloatUtils.h | 0 .../src/utils/SkFrontBufferedStream.cpp | 0 .../src/utils/SkGatherPixelRefsAndRects.cpp | 0 .../src/utils/SkGatherPixelRefsAndRects.h | 0 .../src/utils/SkInterpolator.cpp | 0 .../{trunk => skia}/src/utils/SkLayer.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkLua.cpp | 0 .../{trunk => skia}/src/utils/SkLuaCanvas.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkMD5.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkMD5.h | 0 .../{trunk => skia}/src/utils/SkMatrix22.cpp | 0 .../{trunk => skia}/src/utils/SkMatrix22.h | 0 .../{trunk => skia}/src/utils/SkMatrix44.cpp | 0 .../{trunk => skia}/src/utils/SkMeshUtils.cpp | 0 .../src/utils/SkNWayCanvas.cpp | 0 .../{trunk => skia}/src/utils/SkNinePatch.cpp | 0 .../src/utils/SkNullCanvas.cpp | 0 .../{trunk => skia}/src/utils/SkOSFile.cpp | 0 .../src/utils/SkPDFRasterizer.cpp | 0 .../src/utils/SkPDFRasterizer.h | 0 .../{trunk => skia}/src/utils/SkParse.cpp | 0 .../src/utils/SkParseColor.cpp | 0 .../{trunk => skia}/src/utils/SkParsePath.cpp | 0 .../{trunk => skia}/src/utils/SkPathUtils.cpp | 0 .../src/utils/SkPictureUtils.cpp | 0 .../src/utils/SkProxyCanvas.cpp | 0 .../{trunk => skia}/src/utils/SkRTConf.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkSHA1.cpp | 0 gfx/skia/{trunk => skia}/src/utils/SkSHA1.h | 0 .../{trunk => skia}/src/utils/SkTFitsIn.h | 0 gfx/skia/{trunk => skia}/src/utils/SkTLogic.h | 0 .../src/utils/SkTextureCompressor.cpp | 0 .../src/utils/SkTextureCompressor.h | 0 .../src/utils/SkTextureCompressor_ASTC.cpp | 0 .../src/utils/SkTextureCompressor_ASTC.h | 0 .../src/utils/SkTextureCompressor_LATC.cpp | 0 .../src/utils/SkTextureCompressor_LATC.h | 0 .../src/utils/SkTextureCompressor_R11EAC.cpp | 0 .../src/utils/SkTextureCompressor_R11EAC.h | 0 .../{trunk => skia}/src/utils/SkThreadUtils.h | 0 .../src/utils/SkThreadUtils_pthread.cpp | 0 .../src/utils/SkThreadUtils_pthread.h | 0 .../src/utils/SkThreadUtils_pthread_linux.cpp | 0 .../src/utils/SkThreadUtils_pthread_mach.cpp | 0 .../src/utils/SkThreadUtils_pthread_other.cpp | 0 .../src/utils/SkThreadUtils_win.cpp | 0 .../src/utils/SkThreadUtils_win.h | 0 .../src/utils/debugger/SkDebugCanvas.cpp | 0 .../src/utils/debugger/SkDebugCanvas.h | 0 .../src/utils/debugger/SkDrawCommand.cpp | 0 .../src/utils/debugger/SkDrawCommand.h | 0 .../src/utils/debugger/SkObjectParser.cpp | 0 .../src/utils/debugger/SkObjectParser.h | 0 .../src/utils/ios/SkFontHost_iOS.mm | 0 .../src/utils/ios/SkImageDecoder_iOS.mm | 0 .../src/utils/ios/SkOSFile_iOS.mm | 0 .../src/utils/ios/SkStream_NSData.mm | 0 .../src/utils/mac/SkCreateCGImageRef.cpp | 0 .../src/utils/mac/SkStream_mac.cpp | 0 .../src/utils/win/SkAutoCoInitialize.cpp | 0 .../src/utils/win/SkDWrite.cpp | 0 .../{trunk => skia}/src/utils/win/SkDWrite.h | 0 .../src/utils/win/SkDWriteFontFileStream.cpp | 0 .../src/utils/win/SkDWriteFontFileStream.h | 0 .../src/utils/win/SkDWriteGeometrySink.cpp | 0 .../src/utils/win/SkDWriteGeometrySink.h | 0 .../src/utils/win/SkHRESULT.cpp | 0 .../src/utils/win/SkIStream.cpp | 0 .../src/utils/win/SkWGL_win.cpp | 0 .../src/views/SkBGViewArtist.cpp | 0 .../{trunk => skia}/src/views/SkEvent.cpp | 0 .../{trunk => skia}/src/views/SkEventSink.cpp | 0 .../{trunk => skia}/src/views/SkOSMenu.cpp | 0 .../src/views/SkParsePaint.cpp | 0 .../src/views/SkProgressView.cpp | 0 .../src/views/SkStackViewLayout.cpp | 0 .../{trunk => skia}/src/views/SkTagList.cpp | 0 .../{trunk => skia}/src/views/SkTagList.h | 0 .../{trunk => skia}/src/views/SkTextBox.cpp | 0 .../src/views/SkTouchGesture.cpp | 0 gfx/skia/{trunk => skia}/src/views/SkView.cpp | 0 .../src/views/SkViewInflate.cpp | 0 .../{trunk => skia}/src/views/SkViewPriv.cpp | 0 .../{trunk => skia}/src/views/SkViewPriv.h | 0 .../{trunk => skia}/src/views/SkWidgets.cpp | 0 .../{trunk => skia}/src/views/SkWindow.cpp | 0 .../src/views/animated/SkBorderView.cpp | 0 .../src/views/animated/SkImageView.cpp | 0 .../src/views/animated/SkProgressBarView.cpp | 0 .../src/views/animated/SkScrollBarView.cpp | 0 .../src/views/animated/SkStaticTextView.cpp | 0 .../src/views/animated/SkWidgetViews.cpp | 0 .../src/views/ios/SkOSWindow_iOS.mm | 0 .../src/views/mac/SampleApp-Info.plist | 0 .../src/views/mac/SampleApp.xib | 0 .../src/views/mac/SampleAppDelegate.h | 0 .../src/views/mac/SampleAppDelegate.mm | 0 .../src/views/mac/SkEventNotifier.h | 0 .../src/views/mac/SkEventNotifier.mm | 0 .../{trunk => skia}/src/views/mac/SkNSView.h | 0 .../{trunk => skia}/src/views/mac/SkNSView.mm | 0 .../src/views/mac/SkOSWindow_Mac.cpp | 0 .../src/views/mac/SkOSWindow_Mac.mm | 0 .../src/views/mac/SkOptionsTableView.h | 0 .../src/views/mac/SkOptionsTableView.mm | 0 .../src/views/mac/SkSampleNSView.h | 0 .../src/views/mac/SkSampleNSView.mm | 0 .../src/views/mac/SkTextFieldCell.h | 0 .../src/views/mac/SkTextFieldCell.m | 0 .../{trunk => skia}/src/views/mac/skia_mac.mm | 0 .../src/views/sdl/SkOSWindow_SDL.cpp | 0 .../src/views/unix/SkOSWindow_Unix.cpp | 0 .../src/views/unix/keysym2ucs.c | 0 .../src/views/unix/skia_unix.cpp | 0 .../src/views/win/SkOSWindow_win.cpp | 0 .../src/views/win/skia_win.cpp | 0 .../{trunk => skia}/src/xml/SkBML_Verbs.h | 0 .../src/xml/SkBML_XMLParser.cpp | 0 gfx/skia/{trunk => skia}/src/xml/SkDOM.cpp | 0 gfx/skia/{trunk => skia}/src/xml/SkJS.cpp | 0 .../src/xml/SkJSDisplayable.cpp | 0 .../{trunk => skia}/src/xml/SkXMLParser.cpp | 0 .../src/xml/SkXMLPullParser.cpp | 0 .../{trunk => skia}/src/xml/SkXMLWriter.cpp | 0 gfx/thebes/gfxPlatform.cpp | 2 +- gfx/thebes/moz.build | 2 + image/Downscaler.cpp | 2 +- image/moz.build | 3 + other-licenses/skia-npapi/moz.build | 4 +- widget/gonk/moz.build | 4 +- 1555 files changed, 1588 insertions(+), 956 deletions(-) create mode 100644 gfx/2d/convolverLS3.cpp create mode 100644 gfx/2d/convolverLS3.h rename gfx/skia/{trunk => skia}/include/animator/SkAnimator.h (100%) rename gfx/skia/{trunk => skia}/include/animator/SkAnimatorView.h (100%) rename gfx/skia/{trunk => skia}/include/config/SkUserConfig.h (95%) rename gfx/skia/{trunk => skia}/include/core/SkAdvancedTypefaceMetrics.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkAnnotation.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkBBHFactory.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkBitmap.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkBitmapDevice.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkBlitRow.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkBlurTypes.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkChunkAlloc.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkClipStack.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkColor.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkColorFilter.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkColorPriv.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkColorShader.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkColorTable.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkComposeShader.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkData.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDataTable.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDeque.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDevice.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDeviceProperties.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDither.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDocument.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDraw.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDrawFilter.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDrawLooper.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDrawPictureCallback.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkDynamicAnnotations.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkEndian.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkError.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFixed.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFlattenable.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFlattenableBuffers.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFlattenableSerialization.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFloatBits.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFloatingPoint.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFont.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFontHost.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkFontLCDConfig.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkGraphics.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImage.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImageDecoder.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImageEncoder.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImageGenerator.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkImageInfo.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkInstCnt.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMallocPixelRef.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMask.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMaskFilter.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMath.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMatrix.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkMetaData.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkOSFile.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkOnce.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPackBits.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPaint.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPaintOptionsAndroid.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPatch.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPath.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPathMeasure.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPathRef.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPicture.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPictureRecorder.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPixelRef.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPoint.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPostConfig.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkPreConfig.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkRRect.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkRasterizer.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkReadBuffer.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkReader32.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkRect.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkRefCnt.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkRegion.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkScalar.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkShader.h (99%) rename gfx/skia/{trunk => skia}/include/core/SkSize.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkStream.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkString.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkStrokeRec.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkSurface.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTArray.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTDArray.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTDStack.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTDict.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTInternalLList.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTLazy.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTRegistry.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTSearch.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTemplates.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkThread.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTime.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTypeface.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkTypes.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkUnPreMultiply.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkUtils.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkWeakRefCnt.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkWriteBuffer.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkWriter32.h (100%) rename gfx/skia/{trunk => skia}/include/core/SkXfermode.h (100%) rename gfx/skia/{trunk => skia}/include/device/xps/SkConstexprMath.h (100%) rename gfx/skia/{trunk => skia}/include/device/xps/SkXPSDevice.h (100%) rename gfx/skia/{trunk => skia}/include/effects/Sk1DPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/Sk2DPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkAlphaThresholdFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkArithmeticMode.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkAvoidXfermode.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkBitmapSource.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkBlurDrawLooper.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkBlurImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkBlurMaskFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkColorFilterImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkColorMatrix.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkColorMatrixFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkComposeImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkCornerPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkDashPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkDiscretePathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkDisplacementMapEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkDrawExtraPathEffect.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkDropShadowImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkEmbossMaskFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkGradientShader.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkLayerDrawLooper.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkLayerRasterizer.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkLerpXfermode.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkLightingImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkLumaColorFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkMagnifierImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkMatrixConvolutionImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkMatrixImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkMergeImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkMorphologyImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkOffsetImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkPaintFlagsDrawFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkPerlinNoiseShader.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkPictureImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkPixelXorXfermode.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkPorterDuff.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkRectShaderImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkStippleMaskFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkTableColorFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkTableMaskFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkTestImageFilters.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkTileImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkTransparentShader.h (100%) rename gfx/skia/{trunk => skia}/include/effects/SkXfermodeImageFilter.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrBackendEffectFactory.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrClipData.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrColor.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrConfig.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrContext.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrContextFactory.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrCoordTransform.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrDrawEffect.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrEffect.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrEffectStage.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrEffectUnitTest.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrFontScaler.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrGlyph.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrGpuResource.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrPaint.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrPathRendererChain.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrRect.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrRenderTarget.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrSurface.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrTBackendEffectFactory.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrTexture.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrTextureAccess.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrTypes.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrTypesPriv.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/GrUserConfig.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/SkGpuDevice.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/SkGr.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/SkGrPixelRef.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/SkGrTexturePixelRef.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/GrGLConfig.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/GrGLConfig_chrome.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/GrGLExtensions.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/GrGLFunctions.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/GrGLInterface.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkANGLEGLContext.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkDebugGLContext.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkGLContextHelper.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkMesaGLContext.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkNativeGLContext.h (100%) rename gfx/skia/{trunk => skia}/include/gpu/gl/SkNullGLContext.h (100%) rename gfx/skia/{trunk => skia}/include/images/SkDecodingImageGenerator.h (100%) rename gfx/skia/{trunk => skia}/include/images/SkForceLinking.h (100%) rename gfx/skia/{trunk => skia}/include/images/SkMovie.h (100%) rename gfx/skia/{trunk => skia}/include/images/SkPageFlipper.h (100%) rename gfx/skia/{trunk => skia}/include/pathops/SkPathOps.h (100%) rename gfx/skia/{trunk => skia}/include/pdf/SkPDFDevice.h (100%) rename gfx/skia/{trunk => skia}/include/pdf/SkPDFDocument.h (100%) rename gfx/skia/{trunk => skia}/include/pipe/SkGPipe.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkFontConfigInterface.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkFontMgr.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkFontMgr_indirect.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkFontStyle.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkRemotableFontMgr.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkTypeface_android.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkTypeface_cairo.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkTypeface_mac.h (100%) rename gfx/skia/{trunk => skia}/include/ports/SkTypeface_win.h (100%) rename gfx/skia/{trunk => skia}/include/record/SkRecording.h (100%) rename gfx/skia/{trunk => skia}/include/svg/SkSVGAttribute.h (100%) rename gfx/skia/{trunk => skia}/include/svg/SkSVGBase.h (100%) rename gfx/skia/{trunk => skia}/include/svg/SkSVGPaintState.h (100%) rename gfx/skia/{trunk => skia}/include/svg/SkSVGParser.h (100%) rename gfx/skia/{trunk => skia}/include/svg/SkSVGTypes.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkBoundaryPatch.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkCamera.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkCanvasStateUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkCondVar.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkCubicInterval.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkCullPoints.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkDebugUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkDeferredCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkDumpCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkEventTracer.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkFrontBufferedStream.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkInterpolator.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkJSONCPP.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkLayer.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkLua.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkLuaCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkMatrix44.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkMeshUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkNWayCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkNinePatch.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkNoSaveLayerCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkNullCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkParse.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkParsePaint.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkParsePath.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkPathUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkPictureUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkProxyCanvas.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkRTConf.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkRandom.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkRunnable.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkThreadPool.h (100%) rename gfx/skia/{trunk => skia}/include/utils/SkWGL.h (100%) rename gfx/skia/{trunk => skia}/include/utils/ios/SkStream_NSData.h (100%) rename gfx/skia/{trunk => skia}/include/utils/mac/SkCGUtils.h (100%) rename gfx/skia/{trunk => skia}/include/utils/win/SkAutoCoInitialize.h (100%) rename gfx/skia/{trunk => skia}/include/utils/win/SkHRESULT.h (100%) rename gfx/skia/{trunk => skia}/include/utils/win/SkIStream.h (100%) rename gfx/skia/{trunk => skia}/include/utils/win/SkTScopedComPtr.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkApplication.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkBGViewArtist.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkEvent.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkEventSink.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkKey.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSMenu.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_Android.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_Mac.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_NaCl.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_SDL.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_Unix.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_Win.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkOSWindow_iOS.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkStackViewLayout.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkSystemEventTypes.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkTextBox.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkTouchGesture.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkView.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkViewInflate.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkWidget.h (100%) rename gfx/skia/{trunk => skia}/include/views/SkWindow.h (100%) rename gfx/skia/{trunk => skia}/include/views/android/AndroidKeyToSkKey.h (100%) rename gfx/skia/{trunk => skia}/include/views/animated/SkBorderView.h (100%) rename gfx/skia/{trunk => skia}/include/views/animated/SkImageView.h (100%) rename gfx/skia/{trunk => skia}/include/views/animated/SkProgressBarView.h (100%) rename gfx/skia/{trunk => skia}/include/views/animated/SkScrollBarView.h (100%) rename gfx/skia/{trunk => skia}/include/views/animated/SkWidgetViews.h (100%) rename gfx/skia/{trunk => skia}/include/views/unix/XkeysToSkKeys.h (100%) rename gfx/skia/{trunk => skia}/include/views/unix/keysym2ucs.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkBML_WXMLParser.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkBML_XMLParser.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkDOM.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkJS.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkXMLParser.h (100%) rename gfx/skia/{trunk => skia}/include/xml/SkXMLWriter.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimate.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimate3DSchema.xsd (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimate3DSchema.xsx (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateActive.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateActive.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateBase.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateBase.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateField.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateMaker.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateMaker.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateProperties.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateSchema.xsd (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateSchema.xsx (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateSet.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimateSet.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimator.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimatorScript.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimatorScript.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimatorScript2.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkAnimatorScript2.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkBoundable.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkBoundable.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkBuildCondensedInfo.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkCondensedDebug.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkCondensedRelease.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayAdd.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayAdd.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayApply.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayApply.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayBounds.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayBounds.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayEvent.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayEvent.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayEvents.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayEvents.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayInclude.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayInclude.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayInput.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayInput.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayList.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayList.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayMath.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayMath.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayMovie.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayMovie.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayNumber.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayNumber.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayPost.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayPost.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayRandom.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayRandom.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayScreenplay.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayScreenplay.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayType.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayType.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayTypes.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayTypes.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayXMLParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayXMLParser.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayable.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDisplayable.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDraw3D.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDraw3D.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawBitmap.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawBitmap.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawBlur.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawBlur.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawClip.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawClip.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawColor.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawColor.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawDash.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawDash.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawDiscrete.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawDiscrete.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawEmboss.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawEmboss.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawExtraPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawFull.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawFull.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawGradient.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawGroup.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawGroup.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawLine.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawLine.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawMatrix.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawMatrix.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawOval.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawOval.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPaint.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPaint.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPath.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPoint.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawPoint.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawRectangle.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawRectangle.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawSaveLayer.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawSaveLayer.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawShader.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawText.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawText.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTextBox.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTextBox.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTo.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTo.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTransparentShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawTransparentShader.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawable.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDrawable.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDump.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkDump.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkExtraPathEffects.xsd (100%) rename gfx/skia/{trunk => skia}/src/animator/SkExtras.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkGetCondensedInfo.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkHitClear.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkHitClear.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkHitTest.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkHitTest.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkIntArray.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkMatrixParts.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkMatrixParts.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkMemberInfo.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkMemberInfo.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOpArray.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOpArray.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOperand.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOperand2.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOperandInterpolator.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkOperandIterpolator.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPaintPart.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPaintPart.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkParseSVGPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPathParts.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPathParts.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPostParts.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkPostParts.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScript.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScript.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScript2.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScriptCallBack.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScriptDecompile.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScriptRuntime.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScriptRuntime.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkScriptTokenizer.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkSnapshot.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkSnapshot.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTDArray_Experimental.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTextOnPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTextOnPath.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTextToPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTextToPath.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTime.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTypedArray.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkTypedArray.h (100%) rename gfx/skia/{trunk => skia}/src/animator/SkXMLAnimatorWriter.cpp (100%) rename gfx/skia/{trunk => skia}/src/animator/SkXMLAnimatorWriter.h (100%) rename gfx/skia/{trunk => skia}/src/animator/thingstodo.txt (100%) rename gfx/skia/{trunk => skia}/src/core/SkAAClip.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkAAClip.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkAdvancedTypefaceMetrics.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkAlphaRuns.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkAnnotation.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkAntiRun.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkAutoKern.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBHFactory.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBoxHierarchy.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBoxHierarchyRecord.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBoxHierarchyRecord.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBoxRecord.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBBoxRecord.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmap.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapDevice.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapFilter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapHeap.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapHeap.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcShader.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_filter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_matrix.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_matrixProcs.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_matrix_template.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_procs.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_sample.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_shaderproc.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapProcState_utils.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapScaler.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmapScaler.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBitmap_scroll.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitBWMaskTemplate.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitMask.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitMask_D32.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitRow_D16.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitRow_D32.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter_A8.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter_ARGB32.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter_RGB16.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBlitter_Sprite.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkChecksum.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkChunkAlloc.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkClipStack.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkColor.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkColorFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkColorTable.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkComposeShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkConfig8888.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkConfig8888.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkConvolver.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkConvolver.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkCoreBlitters.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkCubicClipper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkCubicClipper.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkData.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDataTable.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDebug.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeque.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDescriptor.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDevice.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeviceImageFilterProxy.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeviceLooper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeviceLooper.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeviceProfile.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDeviceProfile.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDiscardableMemory.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDistanceFieldGen.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/core/SkDistanceFieldGen.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkDither.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDraw.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDrawLooper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkDrawProcs.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdge.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdge.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdgeBuilder.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdgeBuilder.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdgeClipper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkEdgeClipper.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkEmptyShader.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkError.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkErrorInternals.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFDot6.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFilterProc.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFilterProc.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFilterShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFilterShader.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFlate.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFlate.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFlattenable.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFlattenableSerialization.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFloat.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFloat.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFloatBits.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFont.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFontDescriptor.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFontDescriptor.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkFontHost.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFontStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkFontStream.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkGeometry.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkGeometry.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkGlyph.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkGlyphCache.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/core/SkGlyphCache.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkGlyphCache_Globals.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkGraphics.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkImageGenerator.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkImageGeneratorPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkImageInfo.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkInstCnt.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkLazyFnPtr.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkLazyPtr.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkLineClipper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkLineClipper.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkLocalMatrixShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkLocalMatrixShader.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMallocPixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMask.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMaskFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMaskGamma.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMaskGamma.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMath.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMathPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMatrix.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMatrixClipStateMgr.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMatrixClipStateMgr.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMatrixUtils.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMessageBus.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkMetaData.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMipMap.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkMipMap.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkOrderedReadBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPackBits.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPaint.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPaintDefaults.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPaintOptionsAndroid.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPaintPriv.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPaintPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPatch.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPathHeap.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPathHeap.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPathMeasure.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPathRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPerspIter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPicture.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureData.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureData.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureFlat.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureFlat.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPicturePlayback.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPicturePlayback.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureRangePlayback.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureRangePlayback.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureRecord.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureRecord.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureRecorder.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureReplacementPlayback.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureReplacementPlayback.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureShader.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureStateTree.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPictureStateTree.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkPixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPoint.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkProcSpriteBlitter.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPtrRecorder.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkPtrRecorder.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkQuadClipper.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkQuadClipper.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkQuadTree.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkQuadTree.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRRect.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRTree.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRTree.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRasterClip.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRasterClip.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRasterizer.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkReadBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecord.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordAnalysis.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordAnalysis.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordDraw.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordDraw.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordOpts.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordOpts.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecordPattern.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecorder.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecorder.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecording.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRecords.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRect.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRefDict.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRefDict.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRegion.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkRegionPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkRegion_path.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkSafeMath.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkScalar.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScaledImageCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScaledImageCache.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkScalerContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScalerContext.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkScanPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan_AntiPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan_Antihair.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan_Hairline.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkScan_Path.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkSinTable.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkSmallAllocator.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkSpriteBlitter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkSpriteBlitterTemplate.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkSpriteBlitter_ARGB32.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkSpriteBlitter_RGB16.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStreamPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkString.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStringUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStringUtils.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkStroke.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStroke.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkStrokeRec.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStrokerPriv.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkStrokerPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTDynamicHash.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTInternalSList.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTLList.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTLS.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/core/SkTLS.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTMultiMap.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTObjectPool.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTRefArray.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTSearch.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkTSort.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTextFormatParams.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTextMapStateProc.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTextToPathIter.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkThreadPriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTileGrid.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkTileGrid.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTraceEvent.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTypeface.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkTypefaceCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkTypefaceCache.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkTypefacePriv.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkUnPreMultiply.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkUtilsArm.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkUtilsArm.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkValidatingReadBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkValidatingReadBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkValidationUtils.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkVertState.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkVertState.h (100%) rename gfx/skia/{trunk => skia}/src/core/SkWriteBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkWriter32.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkXfermode.cpp (100%) rename gfx/skia/{trunk => skia}/src/core/SkXfermode_proccoeff.h (100%) rename gfx/skia/{trunk => skia}/src/device/xps/SkXPSDevice.cpp (100%) rename gfx/skia/{trunk => skia}/src/doc/SkDocument.cpp (100%) rename gfx/skia/{trunk => skia}/src/doc/SkDocument_PDF.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/Sk1DPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/Sk2DPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkAlphaThresholdFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkArithmeticMode.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkAvoidXfermode.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBitmapSource.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBlurDrawLooper.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBlurImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBlurMask.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBlurMask.h (100%) rename gfx/skia/{trunk => skia}/src/effects/SkBlurMaskFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkColorFilterImageFilter.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/effects/SkColorFilters.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkColorMatrix.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkColorMatrixFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkComposeImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkCornerPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkDashPathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkDiscretePathEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkDisplacementMapEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkDropShadowImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkEmbossMask.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkEmbossMask.h (100%) rename gfx/skia/{trunk => skia}/src/effects/SkEmbossMaskFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkEmbossMask_Table.h (100%) rename gfx/skia/{trunk => skia}/src/effects/SkGpuBlurUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkGpuBlurUtils.h (100%) rename gfx/skia/{trunk => skia}/src/effects/SkLayerDrawLooper.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkLayerRasterizer.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkLerpXfermode.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkLightingImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkLumaColorFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkMagnifierImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkMatrixConvolutionImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkMatrixImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkMergeImageFilter.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/effects/SkMorphologyImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkOffsetImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkPaintFlagsDrawFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkPerlinNoiseShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkPictureImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkPixelXorXfermode.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkPorterDuff.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkRectShaderImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkStippleMaskFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkTableColorFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkTableMaskFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkTestImageFilters.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/effects/SkTileImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkTransparentShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/SkXfermodeImageFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkBitmapCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkBitmapCache.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkClampRange.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkClampRange.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkGradientShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkGradientShaderPriv.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkLinearGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkLinearGradient.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkRadialGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkRadialGradient.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkRadialGradient_Table.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkSweepGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkSweepGradient.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointConicalGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointConicalGradient.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointConicalGradient_gpu.h (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointRadialGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/effects/gradients/SkTwoPointRadialGradient.h (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkFontMgr_fontconfig.cpp (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkFontMgr_indirect.cpp (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkGScalerContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkGScalerContext.h (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkRemotableFontMgr.cpp (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkTestScalerContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/fonts/SkTestScalerContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAAConvexPathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAAConvexPathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAAHairLinePathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAAHairLinePathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAARectRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAARectRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAddPathRenderers_default.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAllocPool.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAllocPool.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAllocator.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAtlas.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrAtlas.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBinHashKey.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBitmapTextContext.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/gpu/GrBitmapTextContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBlend.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBlend.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBufferAllocPool.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrBufferAllocPool.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrCacheID.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrClipData.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrClipMaskCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrClipMaskCache.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrClipMaskManager.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrClipMaskManager.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrContext.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/gpu/GrDefaultPathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDefaultPathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDistanceFieldTextContext.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/gpu/GrDistanceFieldTextContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDrawState.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDrawState.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDrawTarget.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDrawTarget.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrDrawTargetCaps.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrFontScaler.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrGeometryBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrGpu.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrGpu.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrGpuFactory.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrGpuResource.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrInOrderDrawBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrInOrderDrawBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrIndexBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrLayerCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrLayerCache.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrMemoryPool.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrMemoryPool.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrOrderedSet.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrOvalRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrOvalRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPaint.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPath.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathRange.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathRendererChain.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPathUtils.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPictureUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPictureUtils.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrPlotMgr.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRectanizer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRectanizer_pow2.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRectanizer_pow2.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRectanizer_skyline.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/gpu/GrRectanizer_skyline.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRedBlackTree.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrReducedClip.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrReducedClip.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrRenderTarget.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrResourceCache.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrResourceCache.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrSWMaskHelper.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrSWMaskHelper.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrSoftwarePathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrSoftwarePathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencil.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencil.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilAndCoverPathRenderer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilAndCoverPathRenderer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilAndCoverTextContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilAndCoverTextContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStencilBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrStrokeInfo.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrSurface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTBSearch.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTHashTable.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTemplates.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTest.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTest.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextStrike.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextStrike.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextStrike_impl.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTexture.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTextureAccess.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTraceMarker.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTraceMarker.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrTracing.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/GrVertexBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/SkGpuDevice.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/SkGr.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/SkGrPixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/SkGrTexturePixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/Gr1DKernelEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrBezierEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrBezierEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrBicubicEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrBicubicEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConfigConversionEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConfigConversionEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConvexPolyEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConvexPolyEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConvolutionEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrConvolutionEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrCustomCoordsTextureEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrCustomCoordsTextureEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDashingEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDashingEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDistanceFieldTextureEffect.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDistanceFieldTextureEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDitherEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrDitherEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrMatrixConvolutionEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrMatrixConvolutionEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrOvalEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrOvalEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrRRectEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrRRectEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrSimpleTextureEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrSimpleTextureEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrSingleTextureEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrSingleTextureEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrTextureDomain.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrTextureDomain.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrTextureStripAtlas.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrTextureStripAtlas.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrVertexEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrYUVtoRGBEffect.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/effects/GrYUVtoRGBEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLAssembleGLESInterface.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLAssembleInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLAssembleInterface.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLBufferImpl.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLBufferImpl.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLCaps.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLCaps.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLContext.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLCreateNativeInterface_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLCreateNullInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLDefaultInterface_native.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLDefaultInterface_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLDefines.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLExtensions.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLIRect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLIndexBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLIndexBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLNameAllocator.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLNameAllocator.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLNoOpInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLNoOpInterface.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLPath.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLPathRange.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLPathRange.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgram.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgram.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgramDesc.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgramDesc.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgramEffects.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLProgramEffects.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLRenderTarget.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLRenderTarget.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLSL.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLSL.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLSL_impl.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLShaderBuilder.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLShaderBuilder.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLShaderVar.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLStencilBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLStencilBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLTexture.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLTexture.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLUniformHandle.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLUniformManager.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLUniformManager.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLUtil.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLUtil.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLVertexArray.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLVertexArray.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLVertexBuffer.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLVertexBuffer.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGLVertexEffect.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGpuGL.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGpuGL.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/GrGpuGL_program.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/SkGLContextHelper.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/SkNullGLContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/android/SkNativeGLContext_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/angle/SkANGLEGLContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrBufferObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrBufferObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrDebugGL.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrDebugGL.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrFBBindableObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrFakeRefObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrFrameBufferObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrFrameBufferObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrProgramObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrProgramObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrRenderBufferObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrShaderObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrShaderObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrTextureObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrTextureObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrTextureUnitObj.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrTextureUnitObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/GrVertexArrayObj.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/debug/SkDebugGLContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/mac/SkNativeGLContext_mac.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/mesa/SkMesaGLContext.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/mesa/osmesa_wrapper.h (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/unix/SkNativeGLContext_unix.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/gpu/gl/win/SkNativeGLContext_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkImage.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkImagePriv.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkImagePriv.h (100%) rename gfx/skia/{trunk => skia}/src/image/SkImage_Base.h (100%) rename gfx/skia/{trunk => skia}/src/image/SkImage_Codec.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkImage_Gpu.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkImage_Raster.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkSurface.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkSurface_Base.h (100%) rename gfx/skia/{trunk => skia}/src/image/SkSurface_Gpu.cpp (100%) rename gfx/skia/{trunk => skia}/src/image/SkSurface_Raster.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkDecodingImageGenerator.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkForceLinking.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_FactoryDefault.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_FactoryRegistrar.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_ktx.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libbmp.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libgif.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libico.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libjpeg.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libpng.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_libwebp.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_pkm.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageDecoder_wbmp.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageEncoder.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageEncoder_Factory.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkImageEncoder_argb.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkJpegUtility.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkJpegUtility.h (100%) rename gfx/skia/{trunk => skia}/src/images/SkMovie.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkMovie_gif.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkPageFlipper.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkScaledBitmapSampler.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/SkScaledBitmapSampler.h (100%) rename gfx/skia/{trunk => skia}/src/images/bmpdecoderhelper.cpp (100%) rename gfx/skia/{trunk => skia}/src/images/bmpdecoderhelper.h (100%) rename gfx/skia/{trunk => skia}/src/images/transform_scanline.h (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkCachingPixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkCachingPixelRef.h (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkDiscardableMemoryPool.cpp (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkDiscardableMemoryPool.h (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkDiscardablePixelRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/lazy/SkDiscardablePixelRef.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapFilter_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapFilter_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_arm_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_filter_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_matrixProcs_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_matrix_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_SSSE3.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_SSSE3.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_mips_dsp.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBitmapProcState_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitMask_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitMask_opts_arm_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitMask_opts_arm_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitMask_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRect_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRect_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_SSE4.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_SSE4_asm.S (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_SSE4_x64_asm.S (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_arm_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_arm_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_mips_dsp.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlitRow_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_SSE4.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_SSE4.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkBlurImage_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkColor_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkColor_opts_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMath_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkMorphology_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkTextureCompression_opts.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkTextureCompression_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkTextureCompression_opts_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkTextureCompression_opts_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkTextureCompression_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkUtils_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkUtils_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkUtils_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkUtils_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_SSE2.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_SSE2.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_arm.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_arm_neon.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_arm_neon.h (100%) rename gfx/skia/{trunk => skia}/src/opts/SkXfermode_opts_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/opts/memset.arm.S (100%) rename gfx/skia/{trunk => skia}/src/opts/memset16_neon.S (100%) rename gfx/skia/{trunk => skia}/src/opts/memset32_neon.S (100%) rename gfx/skia/{trunk => skia}/src/opts/opts_check_x86.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkAddIntersections.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkAddIntersections.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDCubicIntersection.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDCubicLineIntersection.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDCubicToQuads.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDLineIntersection.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDQuadImplicit.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDQuadImplicit.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDQuadIntersection.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkDQuadLineIntersection.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkIntersectionHelper.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkIntersections.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkIntersections.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkLineParameters.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpAngle.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpAngle.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpContour.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpContour.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpEdgeBuilder.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpEdgeBuilder.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpSegment.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpSegment.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkOpSpan.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsBounds.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsBounds.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsCommon.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsCommon.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsCubic.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsCubic.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsCurve.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsDebug.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsDebug.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsLine.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsLine.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsOp.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsPoint.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsPoint.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsQuad.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsQuad.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsRect.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsRect.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsSimplify.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsTightBounds.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsTriangle.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsTriangle.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsTypes.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathOpsTypes.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathWriter.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkPathWriter.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkQuarticRoot.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkQuarticRoot.h (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkReduceOrder.cpp (100%) rename gfx/skia/{trunk => skia}/src/pathops/SkReduceOrder.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFCatalog.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFCatalog.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFDevice.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFDeviceFlattener.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFDeviceFlattener.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFDocument.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFFont.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFFont.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFFontImpl.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFFormXObject.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFFormXObject.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFGraphicState.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFGraphicState.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFImage.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFImage.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFPage.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFPage.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFResourceDict.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFResourceDict.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFShader.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFShader.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFStream.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFTypes.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFTypes.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkPDFUtils.h (100%) rename gfx/skia/{trunk => skia}/src/pdf/SkTSet.h (100%) rename gfx/skia/{trunk => skia}/src/pipe/SkGPipePriv.h (100%) rename gfx/skia/{trunk => skia}/src/pipe/SkGPipeRead.cpp (100%) rename gfx/skia/{trunk => skia}/src/pipe/SkGPipeWrite.cpp (100%) rename gfx/skia/{trunk => skia}/src/pipe/utils/SamplePipeControllers.cpp (100%) rename gfx/skia/{trunk => skia}/src/pipe/utils/SamplePipeControllers.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkAtomics_sync.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkAtomics_win.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkBarriers_arm.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkBarriers_tsan.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkBarriers_x86.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkDebug_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkDebug_nacl.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkDebug_stdio.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkDebug_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkDiscardableMemory_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontConfigInterface_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontConfigInterface_direct.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontConfigParser_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontConfigParser_android.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontConfigTypeface.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_FreeType.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_FreeType_common.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_FreeType_common.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_android_old.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_cairo.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_fontconfig.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_linux.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_mac.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontHost_win.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/ports/SkFontMgr_android.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontMgr_default_dw.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontMgr_default_gdi.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkFontMgr_win_dw.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkGlobalInitialization_chromium.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkGlobalInitialization_default.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkImageDecoder_CG.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkImageDecoder_WIC.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkImageDecoder_empty.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkMemory_malloc.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkMemory_mozalloc.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkMutex_pthread.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkMutex_win.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkOSFile_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkOSFile_posix.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkOSFile_stdio.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkOSFile_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkRemotableFontMgr_win_dw.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkScalerContext_win_dw.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkScalerContext_win_dw.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTLS_none.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTLS_pthread.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTLS_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTime_Unix.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTime_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTypeface_win_dw.cpp (100%) rename gfx/skia/{trunk => skia}/src/ports/SkTypeface_win_dw.h (100%) rename gfx/skia/{trunk => skia}/src/ports/SkXMLParser_empty.cpp (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkIBMFamilyClass.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTableTypes.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_EBDT.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_EBLC.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_EBSC.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_V0.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_V1.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_V2.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_V3.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_V4.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_OS_2_VA.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_gasp.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_glyf.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_head.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_hhea.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_loca.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_maxp.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_maxp_CFF.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_maxp_TT.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_name.cpp (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_name.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTTable_post.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkOTUtils.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkPanose.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkPreprocessorSeq.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkSFNTHeader.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkTTCFHeader.h (100%) rename gfx/skia/{trunk => skia}/src/sfnt/SkTypedEnum.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVG.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGCircle.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGCircle.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGClipPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGClipPath.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGDefs.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGDefs.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGElements.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGElements.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGEllipse.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGEllipse.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGFeColorMatrix.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGFeColorMatrix.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGFilter.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGFilter.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGG.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGG.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGGradient.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGGroup.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGGroup.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGImage.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGImage.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGLine.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGLine.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGLinearGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGLinearGradient.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGMask.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGMask.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGMetadata.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGMetadata.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPaintState.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPath.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPolygon.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPolygon.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPolyline.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGPolyline.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGRadialGradient.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGRadialGradient.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGRect.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGRect.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGSVG.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGSVG.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGStop.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGStop.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGSymbol.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGSymbol.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGText.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGText.h (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGUse.cpp (100%) rename gfx/skia/{trunk => skia}/src/svg/SkSVGUse.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBase64.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBase64.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBitSet.cpp (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/utils/SkBitSet.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBitmapHasher.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBitmapHasher.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkBoundaryPatch.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCamera.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCanvasStack.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCanvasStack.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCanvasStateUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCondVar.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCubicInterval.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkCullPoints.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkDashPath.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkDashPathPriv.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkDeferredCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkDumpCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkEventTracer.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkFloatUtils.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkFrontBufferedStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkGatherPixelRefsAndRects.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkGatherPixelRefsAndRects.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkInterpolator.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkLayer.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkLua.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkLuaCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMD5.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMD5.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMatrix22.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMatrix22.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMatrix44.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkMeshUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkNWayCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkNinePatch.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkNullCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkOSFile.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkPDFRasterizer.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkPDFRasterizer.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkParse.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkParseColor.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkParsePath.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkPathUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkPictureUtils.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkProxyCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkRTConf.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkSHA1.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkSHA1.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTFitsIn.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTLogic.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_ASTC.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_ASTC.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_LATC.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_LATC.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_R11EAC.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkTextureCompressor_R11EAC.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_pthread.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_pthread.h (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_pthread_linux.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_pthread_mach.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_pthread_other.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/SkThreadUtils_win.h (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkDebugCanvas.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkDebugCanvas.h (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkDrawCommand.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkDrawCommand.h (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkObjectParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/debugger/SkObjectParser.h (100%) rename gfx/skia/{trunk => skia}/src/utils/ios/SkFontHost_iOS.mm (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/utils/ios/SkImageDecoder_iOS.mm (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/utils/ios/SkOSFile_iOS.mm (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/utils/ios/SkStream_NSData.mm (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/utils/mac/SkCreateCGImageRef.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/mac/SkStream_mac.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkAutoCoInitialize.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWrite.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWrite.h (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWriteFontFileStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWriteFontFileStream.h (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWriteGeometrySink.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkDWriteGeometrySink.h (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkHRESULT.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkIStream.cpp (100%) rename gfx/skia/{trunk => skia}/src/utils/win/SkWGL_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkBGViewArtist.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkEvent.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkEventSink.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkOSMenu.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkParsePaint.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkProgressView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkStackViewLayout.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkTagList.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkTagList.h (100%) rename gfx/skia/{trunk => skia}/src/views/SkTextBox.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkTouchGesture.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkViewInflate.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkViewPriv.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkViewPriv.h (100%) rename gfx/skia/{trunk => skia}/src/views/SkWidgets.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/SkWindow.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkBorderView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkImageView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkProgressBarView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkScrollBarView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkStaticTextView.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/animated/SkWidgetViews.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/ios/SkOSWindow_iOS.mm (100%) mode change 100755 => 100644 rename gfx/skia/{trunk => skia}/src/views/mac/SampleApp-Info.plist (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SampleApp.xib (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SampleAppDelegate.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SampleAppDelegate.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkEventNotifier.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkEventNotifier.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkNSView.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkNSView.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkOSWindow_Mac.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkOSWindow_Mac.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkOptionsTableView.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkOptionsTableView.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkSampleNSView.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkSampleNSView.mm (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkTextFieldCell.h (100%) rename gfx/skia/{trunk => skia}/src/views/mac/SkTextFieldCell.m (100%) rename gfx/skia/{trunk => skia}/src/views/mac/skia_mac.mm (100%) rename gfx/skia/{trunk => skia}/src/views/sdl/SkOSWindow_SDL.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/unix/SkOSWindow_Unix.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/unix/keysym2ucs.c (100%) rename gfx/skia/{trunk => skia}/src/views/unix/skia_unix.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/win/SkOSWindow_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/views/win/skia_win.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkBML_Verbs.h (100%) rename gfx/skia/{trunk => skia}/src/xml/SkBML_XMLParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkDOM.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkJS.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkJSDisplayable.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkXMLParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkXMLPullParser.cpp (100%) rename gfx/skia/{trunk => skia}/src/xml/SkXMLWriter.cpp (100%) diff --git a/configure.in b/configure.in index d3645a7094..2f6c5769eb 100644 --- a/configure.in +++ b/configure.in @@ -7932,6 +7932,7 @@ dnl ======================================================== dnl Skia dnl ======================================================== if test "$MOZ_ENABLE_SKIA"; then + SKIA_INCLUDES="/gfx/skia /gfx/skia/skia/include/config /gfx/skia/skia/include/core" AC_DEFINE(MOZ_ENABLE_SKIA) AC_DEFINE(USE_SKIA) if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then @@ -7939,12 +7940,14 @@ if test "$MOZ_ENABLE_SKIA"; then fi if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then + SKIA_INCLUDES="$SKIA_INCLUDES /gfx/skia/skia/include/gpu /gfx/skia/skia/include/utils" MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) fi fi AC_SUBST(MOZ_ENABLE_SKIA) +AC_SUBST_LIST(SKIA_INCLUDES) dnl ======================================================== dnl disable xul diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index 9c6c061fc1..49515002b6 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -155,3 +155,6 @@ LOCAL_INCLUDES += [ CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] + +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp index 017449062a..c6829d5709 100644 --- a/gfx/2d/DrawTargetSkia.cpp +++ b/gfx/2d/DrawTargetSkia.cpp @@ -8,24 +8,23 @@ #include "SourceSurfaceSkia.h" #include "ScaledFontBase.h" #include "ScaledFontCairo.h" -#include "skia/SkGpuDevice.h" -#include "skia/SkBitmapDevice.h" +#include "skia/include/core/SkBitmapDevice.h" #include "FilterNodeSoftware.h" #ifdef USE_SKIA_GPU -#include "skia/SkGpuDevice.h" -#include "skia/GrGLInterface.h" +#include "skia/include/gpu/SkGpuDevice.h" +#include "skia/include/gpu/gl/GrGLInterface.h" #endif -#include "skia/SkTypeface.h" -#include "skia/SkGradientShader.h" -#include "skia/SkBlurDrawLooper.h" -#include "skia/SkBlurMaskFilter.h" -#include "skia/SkColorFilter.h" -#include "skia/SkDropShadowImageFilter.h" -#include "skia/SkLayerRasterizer.h" -#include "skia/SkLayerDrawLooper.h" -#include "skia/SkDashPathEffect.h" +#include "skia/include/core/SkTypeface.h" +#include "skia/include/effects/SkGradientShader.h" +#include "skia/include/effects/SkBlurDrawLooper.h" +#include "skia/include/effects/SkBlurMaskFilter.h" +#include "skia/include/core/SkColorFilter.h" +#include "skia/include/effects/SkDropShadowImageFilter.h" +#include "skia/include/effects/SkLayerRasterizer.h" +#include "skia/include/effects/SkLayerDrawLooper.h" +#include "skia/include/effects/SkDashPathEffect.h" #include "Logging.h" #include "Tools.h" #include "DataSurfaceHelpers.h" diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h index 27a72748a7..08b0f742da 100644 --- a/gfx/2d/DrawTargetSkia.h +++ b/gfx/2d/DrawTargetSkia.h @@ -7,11 +7,11 @@ #define _MOZILLA_GFX_SOURCESURFACESKIA_H #ifdef USE_SKIA_GPU -#include "skia/GrContext.h" -#include "skia/GrGLInterface.h" +#include "skia/include/gpu/GrContext.h" +#include "skia/include/gpu/gl/GrGLInterface.h" #endif -#include "skia/SkCanvas.h" +#include "skia/include/core/SkCanvas.h" #include "2D.h" #include "HelpersSkia.h" diff --git a/gfx/2d/HelpersSkia.h b/gfx/2d/HelpersSkia.h index 72ad45372f..bd192a51b9 100644 --- a/gfx/2d/HelpersSkia.h +++ b/gfx/2d/HelpersSkia.h @@ -7,11 +7,11 @@ #define MOZILLA_GFX_HELPERSSKIA_H_ #include "2D.h" -#include "skia/SkCanvas.h" -#include "skia/SkDashPathEffect.h" -#include "skia/SkShader.h" +#include "skia/include/core/SkCanvas.h" +#include "skia/include/effects/SkDashPathEffect.h" +#include "skia/include/core/SkShader.h" #ifdef USE_SKIA_GPU -#include "skia/GrTypes.h" +#include "skia/include/gpu/GrTypes.h" #endif #include "mozilla/Assertions.h" #include diff --git a/gfx/2d/PathSkia.h b/gfx/2d/PathSkia.h index 57fd709b0b..8881658605 100644 --- a/gfx/2d/PathSkia.h +++ b/gfx/2d/PathSkia.h @@ -7,7 +7,7 @@ #define MOZILLA_GFX_PATH_SKIA_H_ #include "2D.h" -#include "skia/SkPath.h" +#include "skia/include/core/SkPath.h" namespace mozilla { namespace gfx { diff --git a/gfx/2d/Scale.cpp b/gfx/2d/Scale.cpp index cc47104357..b78f39cfe3 100644 --- a/gfx/2d/Scale.cpp +++ b/gfx/2d/Scale.cpp @@ -6,7 +6,7 @@ #ifdef USE_SKIA #include "HelpersSkia.h" -#include "skia/SkBitmap.h" +#include "skia/include/core/SkBitmap.h" #include "image_operations.h" #endif diff --git a/gfx/2d/ScaledFontBase.cpp b/gfx/2d/ScaledFontBase.cpp index a81d6e5574..dc00cb629b 100644 --- a/gfx/2d/ScaledFontBase.cpp +++ b/gfx/2d/ScaledFontBase.cpp @@ -7,7 +7,7 @@ #ifdef USE_SKIA #include "PathSkia.h" -#include "skia/SkPaint.h" +#include "skia/include/core/SkPaint.h" #endif #ifdef USE_CAIRO diff --git a/gfx/2d/ScaledFontBase.h b/gfx/2d/ScaledFontBase.h index 93f4441be3..985101ca42 100644 --- a/gfx/2d/ScaledFontBase.h +++ b/gfx/2d/ScaledFontBase.h @@ -14,8 +14,8 @@ #endif #ifdef USE_SKIA -#include "skia/SkPath.h" -#include "skia/SkTypeface.h" +#include "skia/include/core/SkPath.h" +#include "skia/include/core/SkTypeface.h" #endif #ifdef USE_CAIRO_SCALED_FONT #include "cairo.h" diff --git a/gfx/2d/ScaledFontCairo.cpp b/gfx/2d/ScaledFontCairo.cpp index 12ab27e262..2304b87f46 100644 --- a/gfx/2d/ScaledFontCairo.cpp +++ b/gfx/2d/ScaledFontCairo.cpp @@ -13,8 +13,8 @@ #endif #if defined(USE_SKIA) && defined(MOZ_ENABLE_FREETYPE) -#include "skia/SkTypeface.h" -#include "skia/SkTypeface_cairo.h" +#include "skia/include/core/SkTypeface.h" +#include "skia/include/ports/SkTypeface_cairo.h" #endif #include diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp index 4679cf5970..f53895d52f 100644 --- a/gfx/2d/ScaledFontMac.cpp +++ b/gfx/2d/ScaledFontMac.cpp @@ -6,9 +6,9 @@ #include "ScaledFontMac.h" #ifdef USE_SKIA #include "PathSkia.h" -#include "skia/SkPaint.h" -#include "skia/SkPath.h" -#include "skia/SkTypeface_mac.h" +#include "skia/include/core/SkPaint.h" +#include "skia/include/core/SkPath.h" +#include "skia/include/ports/SkTypeface_mac.h" #endif #include "DrawTargetCG.h" #include diff --git a/gfx/2d/ScaledFontWin.cpp b/gfx/2d/ScaledFontWin.cpp index 14bd2882cf..5747274c18 100644 --- a/gfx/2d/ScaledFontWin.cpp +++ b/gfx/2d/ScaledFontWin.cpp @@ -7,7 +7,7 @@ #include "ScaledFontBase.h" #ifdef USE_SKIA -#include "skia/SkTypeface_win.h" +#include "skia/include/ports/SkTypeface_win.h" #endif namespace mozilla { diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp index d7e071448d..e33851aa79 100644 --- a/gfx/2d/SourceSurfaceSkia.cpp +++ b/gfx/2d/SourceSurfaceSkia.cpp @@ -6,12 +6,15 @@ #include "Logging.h" #include "SourceSurfaceSkia.h" -#include "skia/SkBitmap.h" -#include "skia/SkDevice.h" +#include "skia/include/core/SkBitmap.h" +#include "skia/include/core/SkDevice.h" #include "HelpersSkia.h" #include "DrawTargetSkia.h" #include "DataSurfaceHelpers.h" -#include "skia/SkGrPixelRef.h" + +#ifdef USE_SKIA_GPU +#include "skia/include/gpu/SkGrPixelRef.h" +#endif namespace mozilla { namespace gfx { diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h index de57602b41..06631acd04 100644 --- a/gfx/2d/SourceSurfaceSkia.h +++ b/gfx/2d/SourceSurfaceSkia.h @@ -8,8 +8,8 @@ #include "2D.h" #include -#include "skia/SkCanvas.h" -#include "skia/SkBitmap.h" +#include "skia/include/core/SkCanvas.h" +#include "skia/include/core/SkBitmap.h" class GrContext; diff --git a/gfx/2d/convolver.cpp b/gfx/2d/convolver.cpp index f1480aaa4e..b02552d052 100644 --- a/gfx/2d/convolver.cpp +++ b/gfx/2d/convolver.cpp @@ -31,13 +31,17 @@ #include -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" #if defined(USE_SSE2) #include "convolverSSE2.h" #endif +#if defined(_MIPS_ARCH_LOONGSON3A) +#include "convolverLS3.h" +#endif + using mozilla::gfx::Factory; #if defined(SK_CPU_LENDIAN) @@ -52,6 +56,18 @@ using mozilla::gfx::Factory; #define A_OFFSET_IDX 0 #endif +#if defined(USE_SSE2) +#define ConvolveHorizontally4_SIMD ConvolveHorizontally4_SSE2 +#define ConvolveHorizontally_SIMD ConvolveHorizontally_SSE2 +#define ConvolveVertically_SIMD ConvolveVertically_SSE2 +#endif + +#if defined(_MIPS_ARCH_LOONGSON3A) +#define ConvolveHorizontally4_SIMD ConvolveHorizontally4_LS3 +#define ConvolveHorizontally_SIMD ConvolveHorizontally_LS3 +#define ConvolveVertically_SIMD ConvolveVertically_LS3 +#endif + namespace skia { namespace { @@ -273,14 +289,14 @@ void ConvolveVertically(const ConvolutionFilter1D::Fixed* filter_values, int filter_length, unsigned char* const* source_data_rows, int width, unsigned char* out_row, - bool has_alpha, bool use_sse2) { + bool has_alpha, bool use_simd) { int processed = 0; -#if defined(USE_SSE2) +#if defined(USE_SSE2) || defined(_MIPS_ARCH_LOONGSON3A) // If the binary was not built with SSE2 support, we had to fallback to C version. int simd_width = width & ~3; - if (use_sse2 && simd_width) { - ConvolveVertically_SSE2(filter_values, filter_length, + if (use_simd && simd_width) { + ConvolveVertically_SIMD(filter_values, filter_length, source_data_rows, 0, simd_width, out_row, has_alpha); processed = simd_width; @@ -301,12 +317,12 @@ void ConvolveVertically(const ConvolutionFilter1D::Fixed* filter_values, void ConvolveHorizontally(const unsigned char* src_data, const ConvolutionFilter1D& filter, unsigned char* out_row, - bool has_alpha, bool use_sse2) { + bool has_alpha, bool use_simd) { int width = filter.num_values(); int processed = 0; #if defined(USE_SSE2) int simd_width = width & ~3; - if (use_sse2 && simd_width) { + if (use_simd && simd_width) { // SIMD implementation works with 4 pixels at a time. // Therefore we process as much as we can using SSE and then use // C implementation for leftovers @@ -394,12 +410,16 @@ void BGRAConvolve2D(const unsigned char* source_data, const ConvolutionFilter1D& filter_y, int output_byte_row_stride, unsigned char* output) { - bool use_sse2 = Factory::HasSSE2(); + bool use_simd = Factory::HasSSE2(); #if !defined(USE_SSE2) // Even we have runtime support for SSE2 instructions, since the binary // was not built with SSE2 support, we had to fallback to C version. - use_sse2 = false; + use_simd = false; +#endif + +#if defined(_MIPS_ARCH_LOONGSON3A) + use_simd = true; #endif @@ -426,7 +446,7 @@ void BGRAConvolve2D(const unsigned char* source_data, // TODO(jiesun): We do not use aligned load from row buffer in vertical // convolution pass yet. Somehow Windows does not like it. int row_buffer_width = (filter_x.num_values() + 15) & ~0xF; - int row_buffer_height = max_y_filter_size + (use_sse2 ? 4 : 0); + int row_buffer_height = max_y_filter_size + (use_simd ? 4 : 0); CircularRowBuffer row_buffer(row_buffer_width, row_buffer_height, filter_offset); @@ -448,8 +468,8 @@ void BGRAConvolve2D(const unsigned char* source_data, &filter_offset, &filter_length); // Generate output rows until we have enough to run the current filter. - if (use_sse2) { -#if defined(USE_SSE2) + if (use_simd) { +#if defined(USE_SSE2) || defined(_MIPS_ARCH_LOONGSON3A) // We don't want to process too much rows in batches of 4 because // we can go out-of-bounds at the end while (next_x_row < filter_offset + filter_length) { @@ -460,7 +480,7 @@ void BGRAConvolve2D(const unsigned char* source_data, src[i] = &source_data[(next_x_row + i) * source_byte_row_stride]; out_row[i] = row_buffer.AdvanceRow(); } - ConvolveHorizontally4_SSE2(src, 0, pixel_width, filter_x, out_row); + ConvolveHorizontally4_SIMD(src, 0, pixel_width, filter_x, out_row); next_x_row += 4; } else { unsigned char* buffer = row_buffer.AdvanceRow(); @@ -469,7 +489,7 @@ void BGRAConvolve2D(const unsigned char* source_data, // image area. therefore we use cobined C+SSE version here int simd_width = pixel_width & ~3; if (simd_width) { - ConvolveHorizontally_SSE2( + ConvolveHorizontally_SIMD( &source_data[next_x_row * source_byte_row_stride], 0, simd_width, filter_x, buffer); } @@ -519,7 +539,7 @@ void BGRAConvolve2D(const unsigned char* source_data, ConvolveVertically(filter_values, filter_length, first_row_for_filter, pixel_width, - cur_output_row, source_has_alpha, use_sse2); + cur_output_row, source_has_alpha, use_simd); } } diff --git a/gfx/2d/convolver.h b/gfx/2d/convolver.h index 6ef882f1ce..156193eb71 100644 --- a/gfx/2d/convolver.h +++ b/gfx/2d/convolver.h @@ -35,7 +35,7 @@ #include "base/basictypes.h" #include "base/cpu.h" #include "mozilla/Assertions.h" -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" // avoid confusion with Mac OS X's math library (Carbon) #if defined(__APPLE__) diff --git a/gfx/2d/convolverLS3.cpp b/gfx/2d/convolverLS3.cpp new file mode 100644 index 0000000000..83006cf402 --- /dev/null +++ b/gfx/2d/convolverLS3.cpp @@ -0,0 +1,831 @@ +// Copyright (c) 2014-2015 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google, Inc. nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. + +#include "convolver.h" +#include +#include "skia/SkTypes.h" + +#if defined(_MIPS_ARCH_LOONGSON3A) + +#include "MMIHelpers.h" + +namespace skia { + +// Convolves horizontally along a single row. The row data is given in +// |src_data| and continues for the [begin, end) of the filter. +void ConvolveHorizontally_LS3(const unsigned char* src_data, + int begin, int end, + const ConvolutionFilter1D& filter, + unsigned char* out_row) { + int tmp, filter_offset, filter_length; + double zero, mask[3], shuf_50, shuf_fa; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "xor %[zero], %[zero], %[zero] \n\t" + // |mask| will be used to decimate all extra filter coefficients that are + // loaded by SIMD when |filter_length| is not divisible by 4. + "li %[tmp], 1 \n\t" + "dsll32 %[tmp], 0x10 \n\t" + "daddiu %[tmp], -1 \n\t" + "dmtc1 %[tmp], %[mask2] \n\t" + "dsrl %[tmp], 0x10 \n\t" + "mtc1 %[tmp], %[mask1] \n\t" + "dsrl %[tmp], 0x10 \n\t" + "mtc1 %[tmp], %[mask0] \n\t" + "ori %[tmp], $0, 0x50 \n\t" + "mtc1 %[tmp], %[shuf_50] \n\t" + "ori %[tmp], $0, 0xfa \n\t" + "mtc1 %[tmp], %[shuf_fa] \n\t" + ".set pop \n\t" + :[zero]"=f"(zero), [mask0]"=f"(mask[0]), + [mask1]"=f"(mask[1]), [mask2]"=f"(mask[2]), + [shuf_50]"=f"(shuf_50), [shuf_fa]"=f"(shuf_fa), + [tmp]"=&r"(tmp) + ); + + // Output one pixel each iteration, calculating all channels (RGBA) together. + for (int out_x = begin; out_x < end; out_x++) { + const ConvolutionFilter1D::Fixed* filter_values = + filter.FilterForValue(out_x, &filter_offset, &filter_length); + double accumh, accuml; + // Compute the first pixel in this row that the filter affects. It will + // touch |filter_length| pixels (4 bytes each) after this. + const void *row_to_filter = + reinterpret_cast(&src_data[filter_offset << 2]); + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + _mm_xor(accum, accum, accum) + ".set pop \n\t" + :[accumh]"=f"(accumh), [accuml]"=f"(accuml) + ); + + // We will load and accumulate with four coefficients per iteration. + for (int filter_x = 0; filter_x < filter_length >> 2; filter_x++) { + double src16h, src16l, mul_hih, mul_hil, mul_loh, mul_lol; + double coeffh, coeffl, src8h, src8l, th, tl, coeff16h, coeff16l; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // Load 4 coefficients => duplicate 1st and 2nd of them for all channels. + // [16] xx xx xx xx c3 c2 c1 c0 + "ldc1 %[coeffl], (%[fval]) \n\t" + "xor %[coeffh], %[coeffh], %[coeffh] \n\t" + // [16] xx xx xx xx c1 c1 c0 c0 + _mm_pshuflh(coeff16, coeff, shuf_50) + // [16] c1 c1 c1 c1 c0 c0 c0 c0 + _mm_punpcklhw(coeff16, coeff16, coeff16) + // Load four pixels => unpack the first two pixels to 16 bits => + // multiply with coefficients => accumulate the convolution result. + // [8] a3 b3 g3 r3 a2 b2 g2 r2 a1 b1 g1 r1 a0 b0 g0 r0 + "gsldlc1 %[src8h], 0xf(%[rtf]) \n\t" + "gsldrc1 %[src8h], 0x8(%[rtf]) \n\t" + "gsldlc1 %[src8l], 0x7(%[rtf]) \n\t" + "gsldrc1 %[src8l], 0x0(%[rtf]) \n\t" + // [16] a1 b1 g1 r1 a0 b0 g0 r0 + _mm_punpcklbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + // [32] a0*c0 b0*c0 g0*c0 r0*c0 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + // [32] a1*c1 b1*c1 g1*c1 r1*c1 + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + // Duplicate 3rd and 4th coefficients for all channels => + // unpack the 3rd and 4th pixels to 16 bits => multiply with coefficients + // => accumulate the convolution results. + // [16] xx xx xx xx c3 c3 c2 c2 + _mm_pshuflh(coeff16, coeff, shuf_fa) + // [16] c3 c3 c3 c3 c2 c2 c2 c2 + _mm_punpcklhw(coeff16, coeff16, coeff16) + // [16] a3 g3 b3 r3 a2 g2 b2 r2 + _mm_punpckhbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + // [32] a2*c2 b2*c2 g2*c2 r2*c2 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + // [32] a3*c3 b3*c3 g3*c3 r3*c3 + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + ".set pop \n\t" + :[th]"=&f"(th), [tl]"=&f"(tl), + [src8h]"=&f"(src8h), [src8l]"=&f"(src8l), + [accumh]"+f"(accumh), [accuml]"+f"(accuml), + [src16h]"=&f"(src16h), [src16l]"=&f"(src16l), + [coeffh]"=&f"(coeffh), [coeffl]"=&f"(coeffl), + [coeff16h]"=&f"(coeff16h), [coeff16l]"=&f"(coeff16l), + [mul_hih]"=&f"(mul_hih), [mul_hil]"=&f"(mul_hil), + [mul_loh]"=&f"(mul_loh), [mul_lol]"=&f"(mul_lol) + :[zeroh]"f"(zero), [zerol]"f"(zero), + [shuf_50]"f"(shuf_50), [shuf_fa]"f"(shuf_fa), + [fval]"r"(filter_values), [rtf]"r"(row_to_filter) + ); + + // Advance the pixel and coefficients pointers. + row_to_filter += 16; + filter_values += 4; + } + + // When |filter_length| is not divisible by 4, we need to decimate some of + // the filter coefficient that was loaded incorrectly to zero; Other than + // that the algorithm is same with above, except that the 4th pixel will be + // always absent. + int r = filter_length & 3; + if (r) { + double coeffh, coeffl, th, tl, coeff16h, coeff16l; + double src8h, src8l, src16h, src16l, mul_hih, mul_hil, mul_loh, mul_lol; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "ldc1 %[coeffl], (%[fval]) \n\t" + "xor %[coeffh], %[coeffh], %[coeffh] \n\t" + // Mask out extra filter taps. + "and %[coeffl], %[coeffl], %[mask] \n\t" + _mm_pshuflh(coeff16, coeff, shuf_50) + _mm_punpcklhw(coeff16, coeff16, coeff16) + "gsldlc1 %[src8h], 0xf(%[rtf]) \n\t" + "gsldrc1 %[src8h], 0x8(%[rtf]) \n\t" + "gsldlc1 %[src8l], 0x7(%[rtf]) \n\t" + "gsldrc1 %[src8l], 0x0(%[rtf]) \n\t" + _mm_punpcklbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + _mm_punpckhbh(src16, src8, zero) + _mm_pshuflh(coeff16, coeff, shuf_fa) + _mm_punpcklhw(coeff16, coeff16, coeff16) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum, accum, t) + ".set pop \n\t" + :[th]"=&f"(th), [tl]"=&f"(tl), + [src8h]"=&f"(src8h), [src8l]"=&f"(src8l), + [accumh]"+f"(accumh), [accuml]"+f"(accuml), + [src16h]"=&f"(src16h), [src16l]"=&f"(src16l), + [coeffh]"=&f"(coeffh), [coeffl]"=&f"(coeffl), + [coeff16h]"=&f"(coeff16h), [coeff16l]"=&f"(coeff16l), + [mul_hih]"=&f"(mul_hih), [mul_hil]"=&f"(mul_hil), + [mul_loh]"=&f"(mul_loh), [mul_lol]"=&f"(mul_lol) + :[fval]"r"(filter_values), [rtf]"r"(row_to_filter), + [zeroh]"f"(zero), [zerol]"f"(zero), [mask]"f"(mask[r-1]), + [shuf_50]"f"(shuf_50), [shuf_fa]"f"(shuf_fa) + ); + } + + double t, sra; + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "ori %[tmp], $0, %[sk_sra] \n\t" + "mtc1 %[tmp], %[sra] \n\t" + // Shift right for fixed point implementation. + _mm_psraw(accum, accum, sra) + // Packing 32 bits |accum| to 16 bits per channel (signed saturation). + _mm_packsswh(accum, accum, zero, t) + // Packing 16 bits |accum| to 8 bits per channel (unsigned saturation). + _mm_packushb(accum, accum, zero, t) + // Store the pixel value of 32 bits. + "swc1 %[accuml], (%[out_row]) \n\t" + ".set pop \n\t" + :[sra]"=&f"(sra), [t]"=&f"(t), [tmp]"=&r"(tmp), + [accumh]"+f"(accumh), [accuml]"+f"(accuml) + :[sk_sra]"i"(ConvolutionFilter1D::kShiftBits), + [out_row]"r"(out_row), [zeroh]"f"(zero), [zerol]"f"(zero) + :"memory" + ); + + out_row += 4; + } +} + +// Convolves horizontally along four rows. The row data is given in +// |src_data| and continues for the [begin, end) of the filter. +// The algorithm is almost same as |ConvolveHorizontally_LS3|. Please +// refer to that function for detailed comments. +void ConvolveHorizontally4_LS3(const unsigned char* src_data[4], + int begin, int end, + const ConvolutionFilter1D& filter, + unsigned char* out_row[4]) { + int tmp, filter_offset, filter_length; + double zero, mask[3], shuf_50, shuf_fa; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "xor %[zero], %[zero], %[zero] \n\t" + // |mask| will be used to decimate all extra filter coefficients that are + // loaded by SIMD when |filter_length| is not divisible by 4. + "li %[tmp], 1 \n\t" + "dsll32 %[tmp], 0x10 \n\t" + "daddiu %[tmp], -1 \n\t" + "dmtc1 %[tmp], %[mask2] \n\t" + "dsrl %[tmp], 0x10 \n\t" + "mtc1 %[tmp], %[mask1] \n\t" + "dsrl %[tmp], 0x10 \n\t" + "mtc1 %[tmp], %[mask0] \n\t" + "ori %[tmp], $0, 0x50 \n\t" + "mtc1 %[tmp], %[shuf_50] \n\t" + "ori %[tmp], $0, 0xfa \n\t" + "mtc1 %[tmp], %[shuf_fa] \n\t" + ".set pop \n\t" + :[zero]"=f"(zero), [mask0]"=f"(mask[0]), + [mask1]"=f"(mask[1]), [mask2]"=f"(mask[2]), + [shuf_50]"=f"(shuf_50), [shuf_fa]"=f"(shuf_fa), + [tmp]"=&r"(tmp) + ); + + // Output one pixel each iteration, calculating all channels (RGBA) together. + for (int out_x = begin; out_x < end; out_x++) { + const ConvolutionFilter1D::Fixed* filter_values = + filter.FilterForValue(out_x, &filter_offset, &filter_length); + double accum0h, accum0l, accum1h, accum1l; + double accum2h, accum2l, accum3h, accum3l; + + // four pixels in a column per iteration. + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + _mm_xor(accum0, accum0, accum0) + _mm_xor(accum1, accum1, accum1) + _mm_xor(accum2, accum2, accum2) + _mm_xor(accum3, accum3, accum3) + ".set pop \n\t" + :[accum0h]"=f"(accum0h), [accum0l]"=f"(accum0l), + [accum1h]"=f"(accum1h), [accum1l]"=f"(accum1l), + [accum2h]"=f"(accum2h), [accum2l]"=f"(accum2l), + [accum3h]"=f"(accum3h), [accum3l]"=f"(accum3l) + ); + + int start = (filter_offset<<2); + // We will load and accumulate with four coefficients per iteration. + for (int filter_x = 0; filter_x < (filter_length >> 2); filter_x++) { + double src8h, src8l, src16h, src16l; + double mul_hih, mul_hil, mul_loh, mul_lol, th, tl; + double coeffh, coeffl, coeff16loh, coeff16lol, coeff16hih, coeff16hil; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // [16] xx xx xx xx c3 c2 c1 c0 + "ldc1 %[coeffl], (%[fval]) \n\t" + "xor %[coeffh], %[coeffh], %[coeffh] \n\t" + // [16] xx xx xx xx c1 c1 c0 c0 + _mm_pshuflh(coeff16lo, coeff, shuf_50) + // [16] c1 c1 c1 c1 c0 c0 c0 c0 + _mm_punpcklhw(coeff16lo, coeff16lo, coeff16lo) + // [16] xx xx xx xx c3 c3 c2 c2 + _mm_pshuflh(coeff16hi, coeff, shuf_fa) + // [16] c3 c3 c3 c3 c2 c2 c2 c2 + _mm_punpcklhw(coeff16hi, coeff16hi, coeff16hi) + ".set pop \n\t" + :[coeffh]"=&f"(coeffh), [coeffl]"=&f"(coeffl), + [coeff16loh]"=&f"(coeff16loh), [coeff16lol]"=&f"(coeff16lol), + [coeff16hih]"=&f"(coeff16hih), [coeff16hil]"=&f"(coeff16hil) + :[fval]"r"(filter_values), [shuf_50]"f"(shuf_50), [shuf_fa]"f"(shuf_fa) + ); + +#define ITERATION(_src, _accumh, _accuml) \ + asm volatile ( \ + ".set push \n\t" \ + ".set arch=loongson3a \n\t" \ + "gsldlc1 %[src8h], 0xf(%[src]) \n\t" \ + "gsldrc1 %[src8h], 0x8(%[src]) \n\t" \ + "gsldlc1 %[src8l], 0x7(%[src]) \n\t" \ + "gsldrc1 %[src8l], 0x0(%[src]) \n\t" \ + _mm_punpcklbh(src16, src8, zero) \ + _mm_pmulhh(mul_hi, src16, coeff16lo) \ + _mm_pmullh(mul_lo, src16, coeff16lo) \ + _mm_punpcklhw(t, mul_lo, mul_hi) \ + _mm_paddw(accum, accum, t) \ + _mm_punpckhhw(t, mul_lo, mul_hi) \ + _mm_paddw(accum, accum, t) \ + _mm_punpckhbh(src16, src8, zero) \ + _mm_pmulhh(mul_hi, src16, coeff16hi) \ + _mm_pmullh(mul_lo, src16, coeff16hi) \ + _mm_punpcklhw(t, mul_lo, mul_hi) \ + _mm_paddw(accum, accum, t) \ + _mm_punpckhhw(t, mul_lo, mul_hi) \ + _mm_paddw(accum, accum, t) \ + ".set pop \n\t" \ + :[th]"=&f"(th), [tl]"=&f"(tl), \ + [src8h]"=&f"(src8h), [src8l]"=&f"(src8l), \ + [src16h]"=&f"(src16h), [src16l]"=&f"(src16l), \ + [mul_hih]"=&f"(mul_hih), [mul_hil]"=&f"(mul_hil), \ + [mul_loh]"=&f"(mul_loh), [mul_lol]"=&f"(mul_lol), \ + [accumh]"+f"(_accumh), [accuml]"+f"(_accuml) \ + :[zeroh]"f"(zero), [zerol]"f"(zero), [src]"r"(_src), \ + [coeff16loh]"f"(coeff16loh), [coeff16lol]"f"(coeff16lol), \ + [coeff16hih]"f"(coeff16hih), [coeff16hil]"f"(coeff16hil) \ + ); + + ITERATION(src_data[0] + start, accum0h, accum0l); + ITERATION(src_data[1] + start, accum1h, accum1l); + ITERATION(src_data[2] + start, accum2h, accum2l); + ITERATION(src_data[3] + start, accum3h, accum3l); + + start += 16; + filter_values += 4; + } + + int r = filter_length & 3; + if (r) { + double src8h, src8l, src16h, src16l; + double mul_hih, mul_hil, mul_loh, mul_lol, th, tl; + double coeffh, coeffl, coeff16loh, coeff16lol, coeff16hih, coeff16hil; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "ldc1 %[coeffl], (%[fval]) \n\t" + "xor %[coeffh], %[coeffh], %[coeffh] \n\t" + // Mask out extra filter taps. + "and %[coeffl], %[coeffl], %[mask] \n\t" + _mm_pshuflh(coeff16lo, coeff, shuf_50) + /* c1 c1 c1 c1 c0 c0 c0 c0 */ + _mm_punpcklhw(coeff16lo, coeff16lo, coeff16lo) + _mm_pshuflh(coeff16hi, coeff, shuf_fa) + _mm_punpcklhw(coeff16hi, coeff16hi, coeff16hi) + ".set pop \n\t" + :[coeffh]"=&f"(coeffh), [coeffl]"=&f"(coeffl), + [coeff16loh]"=&f"(coeff16loh), [coeff16lol]"=&f"(coeff16lol), + [coeff16hih]"=&f"(coeff16hih), [coeff16hil]"=&f"(coeff16hil) + :[fval]"r"(filter_values), [mask]"f"(mask[r-1]), + [shuf_50]"f"(shuf_50), [shuf_fa]"f"(shuf_fa) + ); + + ITERATION(src_data[0] + start, accum0h, accum0l); + ITERATION(src_data[1] + start, accum1h, accum1l); + ITERATION(src_data[2] + start, accum2h, accum2l); + ITERATION(src_data[3] + start, accum3h, accum3l); + } + + double t, sra; + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "ori %[tmp], $0, %[sk_sra] \n\t" + "mtc1 %[tmp], %[sra] \n\t" + _mm_psraw(accum0, accum0, sra) + _mm_packsswh(accum0, accum0, zero, t) + _mm_packushb(accum0, accum0, zero, t) + _mm_psraw(accum1, accum1, sra) + _mm_packsswh(accum1, accum1, zero, t) + _mm_packushb(accum1, accum1, zero, t) + _mm_psraw(accum2, accum2, sra) + _mm_packsswh(accum2, accum2, zero, t) + _mm_packushb(accum2, accum2, zero, t) + _mm_psraw(accum3, accum3, sra) + _mm_packsswh(accum3, accum3, zero, t) + _mm_packushb(accum3, accum3, zero, t) + "swc1 %[accum0l], (%[out_row0]) \n\t" + "swc1 %[accum1l], (%[out_row1]) \n\t" + "swc1 %[accum2l], (%[out_row2]) \n\t" + "swc1 %[accum3l], (%[out_row3]) \n\t" + ".set pop \n\t" + :[accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [accum1h]"+f"(accum1h), [accum1l]"+f"(accum1l), + [accum2h]"+f"(accum2h), [accum2l]"+f"(accum2l), + [accum3h]"+f"(accum3h), [accum3l]"+f"(accum3l), + [sra]"=&f"(sra), [t]"=&f"(t), [tmp]"=&r"(tmp) + :[zeroh]"f"(zero), [zerol]"f"(zero), + [out_row0]"r"(out_row[0]), [out_row1]"r"(out_row[1]), + [out_row2]"r"(out_row[2]), [out_row3]"r"(out_row[3]), + [sk_sra]"i"(ConvolutionFilter1D::kShiftBits) + :"memory" + ); + + out_row[0] += 4; + out_row[1] += 4; + out_row[2] += 4; + out_row[3] += 4; + } +} + +// Does vertical convolution to produce one output row. The filter values and +// length are given in the first two parameters. These are applied to each +// of the rows pointed to in the |source_data_rows| array, with each row +// being |end - begin| wide. +// +// The output must have room for |(end - begin) * 4| bytes. +template +void ConvolveVertically_LS3_impl(const ConvolutionFilter1D::Fixed* filter_values, + int filter_length, + unsigned char* const* source_data_rows, + int begin, int end, + unsigned char* out_row) { + uint64_t tmp; + double zero, sra, coeff16h, coeff16l; + double accum0h, accum0l, accum1h, accum1l; + double accum2h, accum2l, accum3h, accum3l; + const void *src; + int out_x; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "xor %[zero], %[zero], %[zero] \n\t" + "ori %[tmp], $0, %[sk_sra] \n\t" + "mtc1 %[tmp], %[sra] \n\t" + ".set pop \n\t" + :[zero]"=f"(zero), [sra]"=f"(sra), [tmp]"=&r"(tmp) + :[sk_sra]"i"(ConvolutionFilter1D::kShiftBits) + ); + + // Output four pixels per iteration (16 bytes). + for (out_x = begin; out_x + 3 < end; out_x += 4) { + // Accumulated result for each pixel. 32 bits per RGBA channel. + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + _mm_xor(accum0, accum0, accum0) + _mm_xor(accum1, accum1, accum1) + _mm_xor(accum2, accum2, accum2) + _mm_xor(accum3, accum3, accum3) + ".set pop \n\t" + :[accum0h]"=f"(accum0h), [accum0l]"=f"(accum0l), + [accum1h]"=f"(accum1h), [accum1l]"=f"(accum1l), + [accum2h]"=f"(accum2h), [accum2l]"=f"(accum2l), + [accum3h]"=f"(accum3h), [accum3l]"=f"(accum3l) + ); + + // Convolve with one filter coefficient per iteration. + for (int filter_y = 0; filter_y < filter_length; filter_y++) { + double src8h, src8l, src16h, src16l; + double mul_hih, mul_hil, mul_loh, mul_lol, th, tl; + + src = reinterpret_cast( + &source_data_rows[filter_y][out_x << 2]); + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // Duplicate the filter coefficient 8 times. + // [16] cj cj cj cj cj cj cj cj + "mtc1 %[fval], %[coeff16l] \n\t" + "pshufh %[coeff16l], %[coeff16l], %[zerol] \n\t" + "mov.d %[coeff16h], %[coeff16l] \n\t" + // Load four pixels (16 bytes) together. + // [8] a3 b3 g3 r3 a2 b2 g2 r2 a1 b1 g1 r1 a0 b0 g0 r0 + "gsldlc1 %[src8h], 0xf(%[src]) \n\t" + "gsldrc1 %[src8h], 0x8(%[src]) \n\t" + "gsldlc1 %[src8l], 0x7(%[src]) \n\t" + "gsldrc1 %[src8l], 0x0(%[src]) \n\t" + // Unpack 1st and 2nd pixels from 8 bits to 16 bits for each channels => + // multiply with current coefficient => accumulate the result. + // [16] a1 b1 g1 r1 a0 b0 g0 r0 + _mm_punpcklbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + // [32] a0 b0 g0 r0 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum0, accum0, t) + // [32] a1 b1 g1 r1 + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum1, accum1, t) + // Unpack 3rd and 4th pixels from 8 bits to 16 bits for each channels => + // multiply with current coefficient => accumulate the result. + // [16] a3 b3 g3 r3 a2 b2 g2 r2 + _mm_punpckhbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + ".set pop \n\t" + :[th]"=&f"(th), [tl]"=&f"(tl), + [src8h]"=&f"(src8h), [src8l]"=&f"(src8l), + [src16h]"=&f"(src16h), [src16l]"=&f"(src16l), + [mul_hih]"=&f"(mul_hih), [mul_hil]"=&f"(mul_hil), + [mul_loh]"=&f"(mul_loh), [mul_lol]"=&f"(mul_lol), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [accum1h]"+f"(accum1h), [accum1l]"+f"(accum1l), + [coeff16h]"=&f"(coeff16h), [coeff16l]"=&f"(coeff16l) + :[zeroh]"f"(zero), [zerol]"f"(zero), + [fval]"r"(filter_values[filter_y]), + [src]"r"(src) + ); + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // [32] a2 b2 g2 r2 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum2, accum2, t) + // [32] a3 b3 g3 r3 + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum3, accum3, t) + ".set pop \n\t" + :[th]"=&f"(th), [tl]"=&f"(tl), + [mul_hih]"+f"(mul_hih), [mul_hil]"+f"(mul_hil), + [mul_loh]"+f"(mul_loh), [mul_lol]"+f"(mul_lol), + [accum2h]"+f"(accum2h), [accum2l]"+f"(accum2l), + [accum3h]"+f"(accum3h), [accum3l]"+f"(accum3l) + ); + } + + double t; + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // Shift right for fixed point implementation. + _mm_psraw(accum0, accum0, sra) + _mm_psraw(accum1, accum1, sra) + _mm_psraw(accum2, accum2, sra) + _mm_psraw(accum3, accum3, sra) + // Packing 32 bits |accum| to 16 bits per channel (signed saturation). + // [16] a1 b1 g1 r1 a0 b0 g0 r0 + _mm_packsswh(accum0, accum0, accum1, t) + // [16] a3 b3 g3 r3 a2 b2 g2 r2 + _mm_packsswh(accum2, accum2, accum3, t) + // Packing 16 bits |accum| to 8 bits per channel (unsigned saturation). + // [8] a3 b3 g3 r3 a2 b2 g2 r2 a1 b1 g1 r1 a0 b0 g0 r0 + _mm_packushb(accum0, accum0, accum2, t) + ".set pop \n\t" + :[accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [accum1h]"+f"(accum1h), [accum1l]"+f"(accum1l), + [accum2h]"+f"(accum2h), [accum2l]"+f"(accum2l), + [accum3h]"+f"(accum3h), [accum3l]"+f"(accum3l), + [t]"=&f"(t) + :[sra]"f"(sra) + ); + + if (has_alpha) { + double ah, al, bh, bl, srl8, srl16, sll24; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "li %[tmp], 8 \n\t" + "mtc1 %[tmp], %[srl8] \n\t" + "li %[tmp], 16 \n\t" + "mtc1 %[tmp], %[srl16] \n\t" + "li %[tmp], 24 \n\t" + "mtc1 %[tmp], %[sll24] \n\t" + // Compute the max(ri, gi, bi) for each pixel. + // [8] xx a3 b3 g3 xx a2 b2 g2 xx a1 b1 g1 xx a0 b0 g0 + _mm_psraw(a, accum0, srl8) + // [8] xx xx xx max3 xx xx xx max2 xx xx xx max1 xx xx xx max0 + _mm_pmaxub(b, a, accum0) // Max of r and g. + // [8] xx xx a3 b3 xx xx a2 b2 xx xx a1 b1 xx xx a0 b0 + _mm_psrlw(a, accum0, srl16) + // [8] xx xx xx max3 xx xx xx max2 xx xx xx max1 xx xx xx max0 + _mm_pmaxub(b, a, b) // Max of r and g and b. + // [8] max3 00 00 00 max2 00 00 00 max1 00 00 00 max0 00 00 00 + _mm_psllw(b, b, sll24) + // Make sure the value of alpha channel is always larger than maximum + // value of color channels. + _mm_pmaxub(accum0, b, accum0) + ".set pop \n\t" + :[accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [tmp]"=&r"(tmp), [ah]"=&f"(ah), [al]"=&f"(al), + [bh]"=&f"(bh), [bl]"=&f"(bl), [srl8]"=&f"(srl8), + [srl16]"=&f"(srl16), [sll24]"=&f"(sll24) + ); + } else { + double maskh, maskl; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // Set value of alpha channels to 0xFF. + "li %[tmp], 0xff000000 \n\t" + "mtc1 %[tmp], %[maskl] \n\t" + "punpcklwd %[maskl], %[maskl], %[maskl] \n\t" + "mov.d %[maskh], %[maskl] \n\t" + _mm_or(accum0, accum0, mask) + ".set pop \n\t" + :[maskh]"=&f"(maskh), [maskl]"=&f"(maskl), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [tmp]"=&r"(tmp) + ); + } + + // Store the convolution result (16 bytes) and advance the pixel pointers. + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "gssdlc1 %[accum0h], 0xf(%[out_row]) \n\t" + "gssdrc1 %[accum0h], 0x8(%[out_row]) \n\t" + "gssdlc1 %[accum0l], 0x7(%[out_row]) \n\t" + "gssdrc1 %[accum0l], 0x0(%[out_row]) \n\t" + ".set pop \n\t" + ::[accum0h]"f"(accum0h), [accum0l]"f"(accum0l), + [out_row]"r"(out_row) + :"memory" + ); + out_row += 16; + } + + // When the width of the output is not divisible by 4, We need to save one + // pixel (4 bytes) each time. And also the fourth pixel is always absent. + int r = end - out_x; + if (r > 0) { + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + _mm_xor(accum0, accum0, accum0) + _mm_xor(accum1, accum1, accum1) + _mm_xor(accum2, accum2, accum2) + ".set pop \n\t" + :[accum0h]"=&f"(accum0h), [accum0l]"=&f"(accum0l), + [accum1h]"=&f"(accum1h), [accum1l]"=&f"(accum1l), + [accum2h]"=&f"(accum2h), [accum2l]"=&f"(accum2l) + ); + for (int filter_y = 0; filter_y < filter_length; ++filter_y) { + double src8h, src8l, src16h, src16l; + double th, tl, mul_hih, mul_hil, mul_loh, mul_lol; + src = reinterpret_cast( + &source_data_rows[filter_y][out_x<<2]); + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "mtc1 %[fval], %[coeff16l] \n\t" + "pshufh %[coeff16l], %[coeff16l], %[zerol] \n\t" + "mov.d %[coeff16h], %[coeff16l] \n\t" + // [8] a3 b3 g3 r3 a2 b2 g2 r2 a1 b1 g1 r1 a0 b0 g0 r0 + "gsldlc1 %[src8h], 0xf(%[src]) \n\t" + "gsldrc1 %[src8h], 0x8(%[src]) \n\t" + "gsldlc1 %[src8l], 0x7(%[src]) \n\t" + "gsldrc1 %[src8l], 0x0(%[src]) \n\t" + // [16] a1 b1 g1 r1 a0 b0 g0 r0 + _mm_punpcklbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + // [32] a0 b0 g0 r0 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum0, accum0, t) + // [32] a1 b1 g1 r1 + _mm_punpckhhw(t, mul_lo, mul_hi) + _mm_paddw(accum1, accum1, t) + // [16] a3 b3 g3 r3 a2 b2 g2 r2 + _mm_punpckhbh(src16, src8, zero) + _mm_pmulhh(mul_hi, src16, coeff16) + _mm_pmullh(mul_lo, src16, coeff16) + // [32] a2 b2 g2 r2 + _mm_punpcklhw(t, mul_lo, mul_hi) + _mm_paddw(accum2, accum2, t) + ".set pop \n\t" + :[th]"=&f"(th), [tl]"=&f"(tl), + [src8h]"=&f"(src8h), [src8l]"=&f"(src8l), + [src16h]"=&f"(src16h), [src16l]"=&f"(src16l), + [mul_hih]"=&f"(mul_hih), [mul_hil]"=&f"(mul_hil), + [mul_loh]"=&f"(mul_loh), [mul_lol]"=&f"(mul_lol), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [accum1h]"+f"(accum1h), [accum1l]"+f"(accum1l), + [accum2h]"+f"(accum2h), [accum2l]"+f"(accum2l), + [coeff16h]"=&f"(coeff16h), [coeff16l]"=&f"(coeff16l) + :[zeroh]"f"(zero), [zerol]"f"(zero), + [fval]"r"(filter_values[filter_y]), + [src]"r"(src) + ); + } + + double t; + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + _mm_psraw(accum0, accum0, sra) + _mm_psraw(accum1, accum1, sra) + _mm_psraw(accum2, accum2, sra) + // [16] a1 b1 g1 r1 a0 b0 g0 r0 + _mm_packsswh(accum0, accum0, accum1, t) + // [16] a3 b3 g3 r3 a2 b2 g2 r2 + _mm_packsswh(accum2, accum2, zero, t) + // [8] a3 b3 g3 r3 a2 b2 g2 r2 a1 b1 g1 r1 a0 b0 g0 r0 + _mm_packushb(accum0, accum0, accum2, t) + ".set pop \n\t" + :[accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [accum1h]"+f"(accum1h), [accum1l]"+f"(accum1l), + [accum2h]"+f"(accum2h), [accum2l]"+f"(accum2l), + [t]"=&f"(t) + :[zeroh]"f"(zero), [zerol]"f"(zero), [sra]"f"(sra) + ); + if (has_alpha) { + double ah, al, bh, bl, srl8, srl16, sll24; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "li %[tmp], 8 \n\t" + "mtc1 %[tmp], %[srl8] \n\t" + "li %[tmp], 16 \n\t" + "mtc1 %[tmp], %[srl16] \n\t" + "li %[tmp], 24 \n\t" + "mtc1 %[tmp], %[sll24] \n\t" + // [8] xx a3 b3 g3 xx a2 b2 g2 xx a1 b1 g1 xx a0 b0 g0 + _mm_psrlw(a, accum0, srl8) + // [8] xx xx xx max3 xx xx xx max2 xx xx xx max1 xx xx xx max0 + _mm_pmaxub(b, a, accum0) // Max of r and g. + // [8] xx xx a3 b3 xx xx a2 b2 xx xx a1 b1 xx xx a0 b0 + _mm_psrlw(a, accum0, srl16) + // [8] xx xx xx max3 xx xx xx max2 xx xx xx max1 xx xx xx max0 + _mm_pmaxub(b, a, b) // Max of r and g and b. + // [8] max3 00 00 00 max2 00 00 00 max1 00 00 00 max0 00 00 00 + _mm_psllw(b, b, sll24) + _mm_pmaxub(accum0, b, accum0) + ".set pop \n\t" + :[ah]"=&f"(ah), [al]"=&f"(al), [bh]"=&f"(bh), [bl]"=&f"(bl), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), [tmp]"=&r"(tmp), + [srl8]"=&f"(srl8), [srl16]"=&f"(srl16), [sll24]"=&f"(sll24) + ); + } else { + double maskh, maskl; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + // Set value of alpha channels to 0xFF. + "li %[tmp], 0xff000000 \n\t" + "mtc1 %[tmp], %[maskl] \n\t" + "punpcklwd %[maskl], %[maskl], %[maskl] \n\t" + "mov.d %[maskh], %[maskl] \n\t" + _mm_or(accum0, accum0, mask) + ".set pop \n\t" + :[maskh]"=&f"(maskh), [maskl]"=&f"(maskl), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l), + [tmp]"=&r"(tmp) + ); + } + + double s4, s64; + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "li %[tmp], 4 \n\t" + "mtc1 %[tmp], %[s4] \n\t" + "li %[tmp], 64 \n\t" + "mtc1 %[tmp], %[s64] \n\t" + ".set pop \n\t" + :[s4]"=f"(s4), [s64]"=f"(s64), + [tmp]"=&r"(tmp) + ); + for (; out_x < end; out_x++) { + double t; + + asm volatile ( + ".set push \n\t" + ".set arch=loongson3a \n\t" + "swc1 %[accum0l], (%[out_row]) \n\t" + _mm_psrlq(accum0, accum0, s4, s64, t) + ".set pop \n\t" + :[t]"=&f"(t), + [accum0h]"+f"(accum0h), [accum0l]"+f"(accum0l) + :[out_row]"r"(out_row), [s4]"f"(s4), [s64]"f"(s64) + :"memory" + ); + out_row += 4; + } + } +} + +void ConvolveVertically_LS3(const ConvolutionFilter1D::Fixed* filter_values, + int filter_length, + unsigned char* const* source_data_rows, + int begin, int end, + unsigned char* out_row, bool has_alpha) { + if (has_alpha) { + ConvolveVertically_LS3_impl(filter_values, filter_length, + source_data_rows, begin, end, out_row); + } else { + ConvolveVertically_LS3_impl(filter_values, filter_length, + source_data_rows, begin, end, out_row); + } +} + +} // namespace skia + +#endif /* _MIPS_ARCH_LOONGSON3A */ diff --git a/gfx/2d/convolverLS3.h b/gfx/2d/convolverLS3.h new file mode 100644 index 0000000000..7ee26bdc4f --- /dev/null +++ b/gfx/2d/convolverLS3.h @@ -0,0 +1,70 @@ +// Copyright (c) 2014-2015 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google, Inc. nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. + +#ifndef SKIA_EXT_CONVOLVER_LS3_H_ +#define SKIA_EXT_CONVOLVER_LS3_H_ + +#include "convolver.h" + +#include + +#include "skia/SkTypes.h" + +namespace skia { + +// Convolves horizontally along a single row. The row data is given in +// |src_data| and continues for the [begin, end) of the filter. +void ConvolveHorizontally_LS3(const unsigned char* src_data, + int begin, int end, + const ConvolutionFilter1D& filter, + unsigned char* out_row); + +// Convolves horizontally along four rows. The row data is given in +// |src_data| and continues for the [begin, end) of the filter. +// The algorithm is almost same as |ConvolveHorizontally_LS3|. Please +// refer to that function for detailed comments. +void ConvolveHorizontally4_LS3(const unsigned char* src_data[4], + int begin, int end, + const ConvolutionFilter1D& filter, + unsigned char* out_row[4]); + +// Does vertical convolution to produce one output row. The filter values and +// length are given in the first two parameters. These are applied to each +// of the rows pointed to in the |source_data_rows| array, with each row +// being |pixel_width| wide. +// +// The output must have room for |pixel_width * 4| bytes. +void ConvolveVertically_LS3(const ConvolutionFilter1D::Fixed* filter_values, + int filter_length, + unsigned char* const* source_data_rows, + int begin, int end, + unsigned char* out_row, bool has_alpha); + +} // namespace skia + +#endif // SKIA_EXT_CONVOLVER_LS3_H_ diff --git a/gfx/2d/convolverSSE2.cpp b/gfx/2d/convolverSSE2.cpp index 4a177f1de5..a1b223703e 100644 --- a/gfx/2d/convolverSSE2.cpp +++ b/gfx/2d/convolverSSE2.cpp @@ -28,7 +28,7 @@ #include "convolver.h" #include -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" #include // ARCH_CPU_X86_FAMILY was defined in build/config.h diff --git a/gfx/2d/convolverSSE2.h b/gfx/2d/convolverSSE2.h index d1ba5d698e..916c1eddd3 100644 --- a/gfx/2d/convolverSSE2.h +++ b/gfx/2d/convolverSSE2.h @@ -33,7 +33,7 @@ #include -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" namespace skia { diff --git a/gfx/2d/image_operations.cpp b/gfx/2d/image_operations.cpp index 11985b5099..8a913a22c1 100644 --- a/gfx/2d/image_operations.cpp +++ b/gfx/2d/image_operations.cpp @@ -37,10 +37,10 @@ #include "base/stack_container.h" #include "convolver.h" -#include "skia/SkColorPriv.h" -#include "skia/SkBitmap.h" -#include "skia/SkRect.h" -#include "skia/SkFontHost.h" +#include "skia/include/core/SkColorPriv.h" +#include "skia/include/core/SkBitmap.h" +#include "skia/include/core/SkRect.h" +#include "skia/include/core/SkFontHost.h" namespace skia { diff --git a/gfx/2d/image_operations.h b/gfx/2d/image_operations.h index b2a792fde2..2744e2c67f 100644 --- a/gfx/2d/image_operations.h +++ b/gfx/2d/image_operations.h @@ -29,10 +29,10 @@ #ifndef SKIA_EXT_IMAGE_OPERATIONS_H_ #define SKIA_EXT_IMAGE_OPERATIONS_H_ -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" #include "Types.h" #include "convolver.h" -#include "skia/SkRect.h" +#include "skia/include/core/SkRect.h" class SkBitmap; struct SkIRect; diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 9ce208ec9d..f439f3b258 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -98,6 +98,11 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES['ImageScalingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] if CONFIG['MOZ_ENABLE_SKIA']: SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] +elif CONFIG['CPU_ARCH'].startswith('mips'): + if CONFIG['MOZ_ENABLE_SKIA']: + SOURCES += [ + 'convolverLS3.cpp', + ] UNIFIED_SOURCES += [ 'Blur.cpp', @@ -170,3 +175,12 @@ CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'): CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] + +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + +if CONFIG['OS_ARCH'] == 'WINNT': + # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those + # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This + # changes the symbol names of exported C++ functions that use LOGFONT. + del DEFINES['UNICODE'] + del DEFINES['_UNICODE'] diff --git a/gfx/gl/SkiaGLGlue.cpp b/gfx/gl/SkiaGLGlue.cpp index 53f166728c..9befec8c5a 100755 --- a/gfx/gl/SkiaGLGlue.cpp +++ b/gfx/gl/SkiaGLGlue.cpp @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "skia/GrContext.h" -#include "skia/GrGLInterface.h" +#include "skia/include/gpu/GrContext.h" +#include "skia/include/gpu/gl/GrGLInterface.h" #include "mozilla/gfx/2D.h" #include "mozilla/ThreadLocal.h" #include "mozilla/DebugOnly.h" diff --git a/gfx/gl/SkiaGLGlue.h b/gfx/gl/SkiaGLGlue.h index 82b125c867..290bf12e67 100755 --- a/gfx/gl/SkiaGLGlue.h +++ b/gfx/gl/SkiaGLGlue.h @@ -8,8 +8,8 @@ #ifdef USE_SKIA_GPU #include "GLContext.h" -#include "skia/GrGLInterface.h" -#include "skia/GrContext.h" +#include "skia/include/gpu/gl/GrGLInterface.h" +#include "skia/include/gpu/GrContext.h" #include "mozilla/gfx/HelpersSkia.h" namespace mozilla { diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index be9c3e5844..9e6f1a1681 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -153,6 +153,8 @@ if CONFIG['MOZ_D3DCOMPILER_VISTA_DLL']: if CONFIG['MOZ_D3DCOMPILER_XP_DLL']: DEFINES['MOZ_D3DCOMPILER_XP_DLL'] = CONFIG['MOZ_D3DCOMPILER_XP_DLL'] +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp index 7f8a486b88..06799010a5 100644 --- a/gfx/layers/basic/BasicCompositor.cpp +++ b/gfx/layers/basic/BasicCompositor.cpp @@ -18,8 +18,8 @@ #include "ImageContainer.h" #include "gfxPrefs.h" #ifdef MOZ_ENABLE_SKIA -#include "skia/SkCanvas.h" // for SkCanvas -#include "skia/SkBitmapDevice.h" // for SkBitmapDevice +#include "skia/include/core/SkCanvas.h" // for SkCanvas +#include "skia/include/core/SkBitmapDevice.h" // for SkBitmapDevice #else #define PIXMAN_DONT_DEFINE_STDINT #include "pixman.h" // for pixman_f_transform, etc diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp index 5392b7e134..25a2312f19 100644 --- a/gfx/layers/basic/BasicLayerManager.cpp +++ b/gfx/layers/basic/BasicLayerManager.cpp @@ -47,8 +47,8 @@ #include "nsRegion.h" // for nsIntRegion, etc #include "nsTArray.h" // for nsAutoTArray #ifdef MOZ_ENABLE_SKIA -#include "skia/SkCanvas.h" // for SkCanvas -#include "skia/SkBitmapDevice.h" // for SkBitmapDevice +#include "skia/include/core/SkCanvas.h" // for SkCanvas +#include "skia/include/core/SkBitmapDevice.h" // for SkBitmapDevice #else #define PIXMAN_DONT_DEFINE_STDINT #include "pixman.h" // for pixman_f_transform, etc diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index c1968cdb07..817b635533 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -389,3 +389,5 @@ MOCHITEST_MANIFESTS += ['apz/test/mochitest.ini'] CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] + +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index 2be5629f98..70e7d5020d 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -169,25 +169,6 @@ import json platforms = ['linux', 'mac', 'android', 'win'] -custom_includes = { - 'trunk/src/ports/SkAtomics_sync.h': True, - 'trunk/src/ports/SkAtomics_win.h': True, - 'trunk/src/ports/SkBarriers_x86.h': True, - 'trunk/src/ports/SkBarriers_arm.h': True, - 'trunk/src/ports/SkBarriers_tsan.h': True, - 'trunk/src/ports/SkMutex_pthread.h': True, - 'trunk/src/ports/SkMutex_win.h': True -} - -def generate_includes(): - includes = {} - for root, dirs, files in os.walk('trunk/include'): - for name in files: - if name.endswith('.h'): - includes[os.path.join(root, name)] = True - - return dict(includes.items() + custom_includes.items()) - def generate_opt_sources(): opt_sources = {'opts': {''}} for root, dirs, files in os.walk('trunk/src/opts'): @@ -426,14 +407,12 @@ def write_list(f, name, values, indent): write_indent(indent) f.write(']\n') -def write_mozbuild(includes, sources): +def write_mozbuild(sources): filename = 'moz.build' f = open(filename, 'w') f.write(header) - write_list(f, 'EXPORTS.skia', includes, 0) - write_sources(f, sources['common'], 0) f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):\n") @@ -473,10 +452,9 @@ def write_mozbuild(includes, sources): print 'Wrote ' + filename def main(): - includes = generate_includes() platform_sources = generate_platform_sources() separated_sources = generate_separated_sources(platform_sources) - write_mozbuild(includes, separated_sources) + write_mozbuild(separated_sources) if __name__ == '__main__': diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 086413ef4d..61e3b18304 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -13,848 +13,550 @@ # # DO NOT MODIFY THIS FILE IT IS AUTOGENERATED. # -EXPORTS.skia += [ - 'trunk/include/animator/SkAnimator.h', - 'trunk/include/animator/SkAnimatorView.h', - 'trunk/include/config/SkUserConfig.h', - 'trunk/include/core/SkAdvancedTypefaceMetrics.h', - 'trunk/include/core/SkAnnotation.h', - 'trunk/include/core/SkBBHFactory.h', - 'trunk/include/core/SkBitmap.h', - 'trunk/include/core/SkBitmapDevice.h', - 'trunk/include/core/SkBlitRow.h', - 'trunk/include/core/SkBlurTypes.h', - 'trunk/include/core/SkCanvas.h', - 'trunk/include/core/SkChunkAlloc.h', - 'trunk/include/core/SkClipStack.h', - 'trunk/include/core/SkColor.h', - 'trunk/include/core/SkColorFilter.h', - 'trunk/include/core/SkColorPriv.h', - 'trunk/include/core/SkColorShader.h', - 'trunk/include/core/SkColorTable.h', - 'trunk/include/core/SkComposeShader.h', - 'trunk/include/core/SkData.h', - 'trunk/include/core/SkDataTable.h', - 'trunk/include/core/SkDeque.h', - 'trunk/include/core/SkDevice.h', - 'trunk/include/core/SkDeviceProperties.h', - 'trunk/include/core/SkDither.h', - 'trunk/include/core/SkDocument.h', - 'trunk/include/core/SkDraw.h', - 'trunk/include/core/SkDrawFilter.h', - 'trunk/include/core/SkDrawLooper.h', - 'trunk/include/core/SkDrawPictureCallback.h', - 'trunk/include/core/SkDynamicAnnotations.h', - 'trunk/include/core/SkEndian.h', - 'trunk/include/core/SkError.h', - 'trunk/include/core/SkFixed.h', - 'trunk/include/core/SkFlattenable.h', - 'trunk/include/core/SkFlattenableBuffers.h', - 'trunk/include/core/SkFlattenableSerialization.h', - 'trunk/include/core/SkFloatBits.h', - 'trunk/include/core/SkFloatingPoint.h', - 'trunk/include/core/SkFont.h', - 'trunk/include/core/SkFontHost.h', - 'trunk/include/core/SkFontLCDConfig.h', - 'trunk/include/core/SkGraphics.h', - 'trunk/include/core/SkImage.h', - 'trunk/include/core/SkImageDecoder.h', - 'trunk/include/core/SkImageEncoder.h', - 'trunk/include/core/SkImageFilter.h', - 'trunk/include/core/SkImageGenerator.h', - 'trunk/include/core/SkImageInfo.h', - 'trunk/include/core/SkInstCnt.h', - 'trunk/include/core/SkMallocPixelRef.h', - 'trunk/include/core/SkMask.h', - 'trunk/include/core/SkMaskFilter.h', - 'trunk/include/core/SkMath.h', - 'trunk/include/core/SkMatrix.h', - 'trunk/include/core/SkMetaData.h', - 'trunk/include/core/SkOnce.h', - 'trunk/include/core/SkOSFile.h', - 'trunk/include/core/SkPackBits.h', - 'trunk/include/core/SkPaint.h', - 'trunk/include/core/SkPaintOptionsAndroid.h', - 'trunk/include/core/SkPatch.h', - 'trunk/include/core/SkPath.h', - 'trunk/include/core/SkPathEffect.h', - 'trunk/include/core/SkPathMeasure.h', - 'trunk/include/core/SkPathRef.h', - 'trunk/include/core/SkPicture.h', - 'trunk/include/core/SkPictureRecorder.h', - 'trunk/include/core/SkPixelRef.h', - 'trunk/include/core/SkPoint.h', - 'trunk/include/core/SkPostConfig.h', - 'trunk/include/core/SkPreConfig.h', - 'trunk/include/core/SkRasterizer.h', - 'trunk/include/core/SkReadBuffer.h', - 'trunk/include/core/SkReader32.h', - 'trunk/include/core/SkRect.h', - 'trunk/include/core/SkRefCnt.h', - 'trunk/include/core/SkRegion.h', - 'trunk/include/core/SkRRect.h', - 'trunk/include/core/SkScalar.h', - 'trunk/include/core/SkShader.h', - 'trunk/include/core/SkSize.h', - 'trunk/include/core/SkStream.h', - 'trunk/include/core/SkString.h', - 'trunk/include/core/SkStrokeRec.h', - 'trunk/include/core/SkSurface.h', - 'trunk/include/core/SkTArray.h', - 'trunk/include/core/SkTDArray.h', - 'trunk/include/core/SkTDict.h', - 'trunk/include/core/SkTDStack.h', - 'trunk/include/core/SkTemplates.h', - 'trunk/include/core/SkThread.h', - 'trunk/include/core/SkTime.h', - 'trunk/include/core/SkTInternalLList.h', - 'trunk/include/core/SkTLazy.h', - 'trunk/include/core/SkTRegistry.h', - 'trunk/include/core/SkTSearch.h', - 'trunk/include/core/SkTypeface.h', - 'trunk/include/core/SkTypes.h', - 'trunk/include/core/SkUnPreMultiply.h', - 'trunk/include/core/SkUtils.h', - 'trunk/include/core/SkWeakRefCnt.h', - 'trunk/include/core/SkWriteBuffer.h', - 'trunk/include/core/SkWriter32.h', - 'trunk/include/core/SkXfermode.h', - 'trunk/include/device/xps/SkConstexprMath.h', - 'trunk/include/device/xps/SkXPSDevice.h', - 'trunk/include/effects/Sk1DPathEffect.h', - 'trunk/include/effects/Sk2DPathEffect.h', - 'trunk/include/effects/SkAlphaThresholdFilter.h', - 'trunk/include/effects/SkArithmeticMode.h', - 'trunk/include/effects/SkAvoidXfermode.h', - 'trunk/include/effects/SkBitmapSource.h', - 'trunk/include/effects/SkBlurDrawLooper.h', - 'trunk/include/effects/SkBlurImageFilter.h', - 'trunk/include/effects/SkBlurMaskFilter.h', - 'trunk/include/effects/SkColorFilterImageFilter.h', - 'trunk/include/effects/SkColorMatrix.h', - 'trunk/include/effects/SkColorMatrixFilter.h', - 'trunk/include/effects/SkComposeImageFilter.h', - 'trunk/include/effects/SkCornerPathEffect.h', - 'trunk/include/effects/SkDashPathEffect.h', - 'trunk/include/effects/SkDiscretePathEffect.h', - 'trunk/include/effects/SkDisplacementMapEffect.h', - 'trunk/include/effects/SkDrawExtraPathEffect.h', - 'trunk/include/effects/SkDropShadowImageFilter.h', - 'trunk/include/effects/SkEmbossMaskFilter.h', - 'trunk/include/effects/SkGradientShader.h', - 'trunk/include/effects/SkLayerDrawLooper.h', - 'trunk/include/effects/SkLayerRasterizer.h', - 'trunk/include/effects/SkLerpXfermode.h', - 'trunk/include/effects/SkLightingImageFilter.h', - 'trunk/include/effects/SkLumaColorFilter.h', - 'trunk/include/effects/SkMagnifierImageFilter.h', - 'trunk/include/effects/SkMatrixConvolutionImageFilter.h', - 'trunk/include/effects/SkMatrixImageFilter.h', - 'trunk/include/effects/SkMergeImageFilter.h', - 'trunk/include/effects/SkMorphologyImageFilter.h', - 'trunk/include/effects/SkOffsetImageFilter.h', - 'trunk/include/effects/SkPaintFlagsDrawFilter.h', - 'trunk/include/effects/SkPerlinNoiseShader.h', - 'trunk/include/effects/SkPictureImageFilter.h', - 'trunk/include/effects/SkPixelXorXfermode.h', - 'trunk/include/effects/SkPorterDuff.h', - 'trunk/include/effects/SkRectShaderImageFilter.h', - 'trunk/include/effects/SkStippleMaskFilter.h', - 'trunk/include/effects/SkTableColorFilter.h', - 'trunk/include/effects/SkTableMaskFilter.h', - 'trunk/include/effects/SkTestImageFilters.h', - 'trunk/include/effects/SkTileImageFilter.h', - 'trunk/include/effects/SkTransparentShader.h', - 'trunk/include/effects/SkXfermodeImageFilter.h', - 'trunk/include/gpu/gl/GrGLConfig.h', - 'trunk/include/gpu/gl/GrGLConfig_chrome.h', - 'trunk/include/gpu/gl/GrGLExtensions.h', - 'trunk/include/gpu/gl/GrGLFunctions.h', - 'trunk/include/gpu/gl/GrGLInterface.h', - 'trunk/include/gpu/gl/SkANGLEGLContext.h', - 'trunk/include/gpu/gl/SkDebugGLContext.h', - 'trunk/include/gpu/gl/SkGLContextHelper.h', - 'trunk/include/gpu/gl/SkMesaGLContext.h', - 'trunk/include/gpu/gl/SkNativeGLContext.h', - 'trunk/include/gpu/gl/SkNullGLContext.h', - 'trunk/include/gpu/GrBackendEffectFactory.h', - 'trunk/include/gpu/GrClipData.h', - 'trunk/include/gpu/GrColor.h', - 'trunk/include/gpu/GrConfig.h', - 'trunk/include/gpu/GrContext.h', - 'trunk/include/gpu/GrContextFactory.h', - 'trunk/include/gpu/GrCoordTransform.h', - 'trunk/include/gpu/GrDrawEffect.h', - 'trunk/include/gpu/GrEffect.h', - 'trunk/include/gpu/GrEffectStage.h', - 'trunk/include/gpu/GrEffectUnitTest.h', - 'trunk/include/gpu/GrFontScaler.h', - 'trunk/include/gpu/GrGlyph.h', - 'trunk/include/gpu/GrGpuResource.h', - 'trunk/include/gpu/GrPaint.h', - 'trunk/include/gpu/GrPathRendererChain.h', - 'trunk/include/gpu/GrRect.h', - 'trunk/include/gpu/GrRenderTarget.h', - 'trunk/include/gpu/GrSurface.h', - 'trunk/include/gpu/GrTBackendEffectFactory.h', - 'trunk/include/gpu/GrTexture.h', - 'trunk/include/gpu/GrTextureAccess.h', - 'trunk/include/gpu/GrTypes.h', - 'trunk/include/gpu/GrTypesPriv.h', - 'trunk/include/gpu/GrUserConfig.h', - 'trunk/include/gpu/SkGpuDevice.h', - 'trunk/include/gpu/SkGr.h', - 'trunk/include/gpu/SkGrPixelRef.h', - 'trunk/include/gpu/SkGrTexturePixelRef.h', - 'trunk/include/images/SkDecodingImageGenerator.h', - 'trunk/include/images/SkForceLinking.h', - 'trunk/include/images/SkMovie.h', - 'trunk/include/images/SkPageFlipper.h', - 'trunk/include/pathops/SkPathOps.h', - 'trunk/include/pdf/SkPDFDevice.h', - 'trunk/include/pdf/SkPDFDocument.h', - 'trunk/include/pipe/SkGPipe.h', - 'trunk/include/ports/SkFontConfigInterface.h', - 'trunk/include/ports/SkFontMgr.h', - 'trunk/include/ports/SkFontMgr_indirect.h', - 'trunk/include/ports/SkFontStyle.h', - 'trunk/include/ports/SkRemotableFontMgr.h', - 'trunk/include/ports/SkTypeface_android.h', - 'trunk/include/ports/SkTypeface_cairo.h', - 'trunk/include/ports/SkTypeface_mac.h', - 'trunk/include/ports/SkTypeface_win.h', - 'trunk/include/record/SkRecording.h', - 'trunk/include/svg/SkSVGAttribute.h', - 'trunk/include/svg/SkSVGBase.h', - 'trunk/include/svg/SkSVGPaintState.h', - 'trunk/include/svg/SkSVGParser.h', - 'trunk/include/svg/SkSVGTypes.h', - 'trunk/include/utils/ios/SkStream_NSData.h', - 'trunk/include/utils/mac/SkCGUtils.h', - 'trunk/include/utils/SkBoundaryPatch.h', - 'trunk/include/utils/SkCamera.h', - 'trunk/include/utils/SkCanvasStateUtils.h', - 'trunk/include/utils/SkCondVar.h', - 'trunk/include/utils/SkCubicInterval.h', - 'trunk/include/utils/SkCullPoints.h', - 'trunk/include/utils/SkDebugUtils.h', - 'trunk/include/utils/SkDeferredCanvas.h', - 'trunk/include/utils/SkDumpCanvas.h', - 'trunk/include/utils/SkEventTracer.h', - 'trunk/include/utils/SkFrontBufferedStream.h', - 'trunk/include/utils/SkInterpolator.h', - 'trunk/include/utils/SkJSONCPP.h', - 'trunk/include/utils/SkLayer.h', - 'trunk/include/utils/SkLua.h', - 'trunk/include/utils/SkLuaCanvas.h', - 'trunk/include/utils/SkMatrix44.h', - 'trunk/include/utils/SkMeshUtils.h', - 'trunk/include/utils/SkNinePatch.h', - 'trunk/include/utils/SkNoSaveLayerCanvas.h', - 'trunk/include/utils/SkNullCanvas.h', - 'trunk/include/utils/SkNWayCanvas.h', - 'trunk/include/utils/SkParse.h', - 'trunk/include/utils/SkParsePaint.h', - 'trunk/include/utils/SkParsePath.h', - 'trunk/include/utils/SkPathUtils.h', - 'trunk/include/utils/SkPictureUtils.h', - 'trunk/include/utils/SkProxyCanvas.h', - 'trunk/include/utils/SkRandom.h', - 'trunk/include/utils/SkRTConf.h', - 'trunk/include/utils/SkRunnable.h', - 'trunk/include/utils/SkThreadPool.h', - 'trunk/include/utils/SkWGL.h', - 'trunk/include/utils/win/SkAutoCoInitialize.h', - 'trunk/include/utils/win/SkHRESULT.h', - 'trunk/include/utils/win/SkIStream.h', - 'trunk/include/utils/win/SkTScopedComPtr.h', - 'trunk/include/views/android/AndroidKeyToSkKey.h', - 'trunk/include/views/animated/SkBorderView.h', - 'trunk/include/views/animated/SkImageView.h', - 'trunk/include/views/animated/SkProgressBarView.h', - 'trunk/include/views/animated/SkScrollBarView.h', - 'trunk/include/views/animated/SkWidgetViews.h', - 'trunk/include/views/SkApplication.h', - 'trunk/include/views/SkBGViewArtist.h', - 'trunk/include/views/SkEvent.h', - 'trunk/include/views/SkEventSink.h', - 'trunk/include/views/SkKey.h', - 'trunk/include/views/SkOSMenu.h', - 'trunk/include/views/SkOSWindow_Android.h', - 'trunk/include/views/SkOSWindow_iOS.h', - 'trunk/include/views/SkOSWindow_Mac.h', - 'trunk/include/views/SkOSWindow_NaCl.h', - 'trunk/include/views/SkOSWindow_SDL.h', - 'trunk/include/views/SkOSWindow_Unix.h', - 'trunk/include/views/SkOSWindow_Win.h', - 'trunk/include/views/SkStackViewLayout.h', - 'trunk/include/views/SkSystemEventTypes.h', - 'trunk/include/views/SkTextBox.h', - 'trunk/include/views/SkTouchGesture.h', - 'trunk/include/views/SkView.h', - 'trunk/include/views/SkViewInflate.h', - 'trunk/include/views/SkWidget.h', - 'trunk/include/views/SkWindow.h', - 'trunk/include/views/unix/keysym2ucs.h', - 'trunk/include/views/unix/XkeysToSkKeys.h', - 'trunk/include/xml/SkBML_WXMLParser.h', - 'trunk/include/xml/SkBML_XMLParser.h', - 'trunk/include/xml/SkDOM.h', - 'trunk/include/xml/SkJS.h', - 'trunk/include/xml/SkXMLParser.h', - 'trunk/include/xml/SkXMLWriter.h', - 'trunk/src/ports/SkAtomics_sync.h', - 'trunk/src/ports/SkAtomics_win.h', - 'trunk/src/ports/SkBarriers_arm.h', - 'trunk/src/ports/SkBarriers_tsan.h', - 'trunk/src/ports/SkBarriers_x86.h', - 'trunk/src/ports/SkMutex_pthread.h', - 'trunk/src/ports/SkMutex_win.h', -] UNIFIED_SOURCES += [ - 'trunk/src/core/SkAAClip.cpp', - 'trunk/src/core/SkAlphaRuns.cpp', - 'trunk/src/core/SkAnnotation.cpp', - 'trunk/src/core/SkBBHFactory.cpp', - 'trunk/src/core/SkBBoxHierarchyRecord.cpp', - 'trunk/src/core/SkBBoxRecord.cpp', - 'trunk/src/core/SkBitmap.cpp', - 'trunk/src/core/SkBitmap_scroll.cpp', - 'trunk/src/core/SkBitmapDevice.cpp', - 'trunk/src/core/SkBitmapFilter.cpp', - 'trunk/src/core/SkBitmapHeap.cpp', - 'trunk/src/core/SkBitmapProcShader.cpp', - 'trunk/src/core/SkBitmapProcState.cpp', - 'trunk/src/core/SkBitmapScaler.cpp', - 'trunk/src/core/SkBlitMask_D32.cpp', - 'trunk/src/core/SkBlitRow_D16.cpp', - 'trunk/src/core/SkBlitRow_D32.cpp', - 'trunk/src/core/SkBlitter.cpp', - 'trunk/src/core/SkBuffer.cpp', - 'trunk/src/core/SkCanvas.cpp', - 'trunk/src/core/SkChunkAlloc.cpp', - 'trunk/src/core/SkClipStack.cpp', - 'trunk/src/core/SkColor.cpp', - 'trunk/src/core/SkColorFilter.cpp', - 'trunk/src/core/SkColorTable.cpp', - 'trunk/src/core/SkComposeShader.cpp', - 'trunk/src/core/SkConfig8888.cpp', - 'trunk/src/core/SkConvolver.cpp', - 'trunk/src/core/SkCubicClipper.cpp', - 'trunk/src/core/SkData.cpp', - 'trunk/src/core/SkDataTable.cpp', - 'trunk/src/core/SkDebug.cpp', - 'trunk/src/core/SkDeque.cpp', - 'trunk/src/core/SkDevice.cpp', - 'trunk/src/core/SkDeviceLooper.cpp', - 'trunk/src/core/SkDeviceProfile.cpp', - 'trunk/src/core/SkDistanceFieldGen.cpp', - 'trunk/src/core/SkDither.cpp', - 'trunk/src/core/SkDraw.cpp', - 'trunk/src/core/SkDrawLooper.cpp', - 'trunk/src/core/SkEdge.cpp', - 'trunk/src/core/SkEdgeBuilder.cpp', - 'trunk/src/core/SkEdgeClipper.cpp', - 'trunk/src/core/SkError.cpp', - 'trunk/src/core/SkFilterProc.cpp', - 'trunk/src/core/SkFilterShader.cpp', - 'trunk/src/core/SkFlattenable.cpp', - 'trunk/src/core/SkFlattenableSerialization.cpp', - 'trunk/src/core/SkFloat.cpp', - 'trunk/src/core/SkFloatBits.cpp', - 'trunk/src/core/SkFont.cpp', - 'trunk/src/core/SkFontDescriptor.cpp', - 'trunk/src/core/SkFontStream.cpp', - 'trunk/src/core/SkGeometry.cpp', - 'trunk/src/core/SkGlyphCache.cpp', - 'trunk/src/core/SkGraphics.cpp', - 'trunk/src/core/SkImageFilter.cpp', - 'trunk/src/core/SkImageGenerator.cpp', - 'trunk/src/core/SkImageInfo.cpp', - 'trunk/src/core/SkInstCnt.cpp', - 'trunk/src/core/SkLineClipper.cpp', - 'trunk/src/core/SkLocalMatrixShader.cpp', - 'trunk/src/core/SkMallocPixelRef.cpp', - 'trunk/src/core/SkMask.cpp', - 'trunk/src/core/SkMaskFilter.cpp', - 'trunk/src/core/SkMaskGamma.cpp', - 'trunk/src/core/SkMath.cpp', - 'trunk/src/core/SkMatrix.cpp', - 'trunk/src/core/SkMatrixClipStateMgr.cpp', - 'trunk/src/core/SkMetaData.cpp', - 'trunk/src/core/SkMipMap.cpp', - 'trunk/src/core/SkPackBits.cpp', - 'trunk/src/core/SkPaint.cpp', - 'trunk/src/core/SkPaintOptionsAndroid.cpp', - 'trunk/src/core/SkPaintPriv.cpp', - 'trunk/src/core/SkPatch.cpp', - 'trunk/src/core/SkPath.cpp', - 'trunk/src/core/SkPathEffect.cpp', - 'trunk/src/core/SkPathHeap.cpp', - 'trunk/src/core/SkPathMeasure.cpp', - 'trunk/src/core/SkPathRef.cpp', - 'trunk/src/core/SkPicture.cpp', - 'trunk/src/core/SkPictureFlat.cpp', - 'trunk/src/core/SkPicturePlayback.cpp', - 'trunk/src/core/SkPictureRangePlayback.cpp', - 'trunk/src/core/SkPictureRecord.cpp', - 'trunk/src/core/SkPictureRecorder.cpp', - 'trunk/src/core/SkPictureReplacementPlayback.cpp', - 'trunk/src/core/SkPictureShader.cpp', - 'trunk/src/core/SkPictureStateTree.cpp', - 'trunk/src/core/SkPixelRef.cpp', - 'trunk/src/core/SkPoint.cpp', - 'trunk/src/core/SkProcSpriteBlitter.cpp', - 'trunk/src/core/SkPtrRecorder.cpp', - 'trunk/src/core/SkQuadClipper.cpp', - 'trunk/src/core/SkQuadTree.cpp', - 'trunk/src/core/SkRasterClip.cpp', - 'trunk/src/core/SkRasterizer.cpp', - 'trunk/src/core/SkReadBuffer.cpp', - 'trunk/src/core/SkRecordAnalysis.cpp', - 'trunk/src/core/SkRecordDraw.cpp', - 'trunk/src/core/SkRecorder.cpp', - 'trunk/src/core/SkRecording.cpp', - 'trunk/src/core/SkRecordOpts.cpp', - 'trunk/src/core/SkRect.cpp', - 'trunk/src/core/SkRefDict.cpp', - 'trunk/src/core/SkRegion.cpp', - 'trunk/src/core/SkRegion_path.cpp', - 'trunk/src/core/SkRRect.cpp', - 'trunk/src/core/SkRTree.cpp', - 'trunk/src/core/SkScalar.cpp', - 'trunk/src/core/SkScalerContext.cpp', - 'trunk/src/core/SkScan.cpp', - 'trunk/src/core/SkScan_AntiPath.cpp', - 'trunk/src/core/SkScan_Hairline.cpp', - 'trunk/src/core/SkScan_Path.cpp', - 'trunk/src/core/SkShader.cpp', - 'trunk/src/core/SkSpriteBlitter_ARGB32.cpp', - 'trunk/src/core/SkSpriteBlitter_RGB16.cpp', - 'trunk/src/core/SkStream.cpp', - 'trunk/src/core/SkString.cpp', - 'trunk/src/core/SkStringUtils.cpp', - 'trunk/src/core/SkStroke.cpp', - 'trunk/src/core/SkStrokeRec.cpp', - 'trunk/src/core/SkStrokerPriv.cpp', - 'trunk/src/core/SkTileGrid.cpp', - 'trunk/src/core/SkTLS.cpp', - 'trunk/src/core/SkTSearch.cpp', - 'trunk/src/core/SkTypeface.cpp', - 'trunk/src/core/SkTypefaceCache.cpp', - 'trunk/src/core/SkUnPreMultiply.cpp', - 'trunk/src/core/SkUtils.cpp', - 'trunk/src/core/SkValidatingReadBuffer.cpp', - 'trunk/src/core/SkVertState.cpp', - 'trunk/src/core/SkWriteBuffer.cpp', - 'trunk/src/core/SkWriter32.cpp', - 'trunk/src/core/SkXfermode.cpp', - 'trunk/src/doc/SkDocument.cpp', - 'trunk/src/effects/gradients/SkBitmapCache.cpp', - 'trunk/src/effects/gradients/SkClampRange.cpp', - 'trunk/src/effects/gradients/SkGradientShader.cpp', - 'trunk/src/effects/gradients/SkLinearGradient.cpp', - 'trunk/src/effects/gradients/SkRadialGradient.cpp', - 'trunk/src/effects/gradients/SkSweepGradient.cpp', - 'trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp', - 'trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', - 'trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp', - 'trunk/src/effects/Sk1DPathEffect.cpp', - 'trunk/src/effects/Sk2DPathEffect.cpp', - 'trunk/src/effects/SkAlphaThresholdFilter.cpp', - 'trunk/src/effects/SkArithmeticMode.cpp', - 'trunk/src/effects/SkAvoidXfermode.cpp', - 'trunk/src/effects/SkBitmapSource.cpp', - 'trunk/src/effects/SkBlurDrawLooper.cpp', - 'trunk/src/effects/SkBlurImageFilter.cpp', - 'trunk/src/effects/SkBlurMask.cpp', - 'trunk/src/effects/SkBlurMaskFilter.cpp', - 'trunk/src/effects/SkColorFilterImageFilter.cpp', - 'trunk/src/effects/SkColorFilters.cpp', - 'trunk/src/effects/SkColorMatrix.cpp', - 'trunk/src/effects/SkColorMatrixFilter.cpp', - 'trunk/src/effects/SkComposeImageFilter.cpp', - 'trunk/src/effects/SkCornerPathEffect.cpp', - 'trunk/src/effects/SkDashPathEffect.cpp', - 'trunk/src/effects/SkDiscretePathEffect.cpp', - 'trunk/src/effects/SkDisplacementMapEffect.cpp', - 'trunk/src/effects/SkDropShadowImageFilter.cpp', - 'trunk/src/effects/SkEmbossMask.cpp', - 'trunk/src/effects/SkEmbossMaskFilter.cpp', - 'trunk/src/effects/SkGpuBlurUtils.cpp', - 'trunk/src/effects/SkLayerDrawLooper.cpp', - 'trunk/src/effects/SkLayerRasterizer.cpp', - 'trunk/src/effects/SkLerpXfermode.cpp', - 'trunk/src/effects/SkLightingImageFilter.cpp', - 'trunk/src/effects/SkLumaColorFilter.cpp', - 'trunk/src/effects/SkMagnifierImageFilter.cpp', - 'trunk/src/effects/SkMatrixConvolutionImageFilter.cpp', - 'trunk/src/effects/SkMatrixImageFilter.cpp', - 'trunk/src/effects/SkMergeImageFilter.cpp', - 'trunk/src/effects/SkMorphologyImageFilter.cpp', - 'trunk/src/effects/SkOffsetImageFilter.cpp', - 'trunk/src/effects/SkPaintFlagsDrawFilter.cpp', - 'trunk/src/effects/SkPerlinNoiseShader.cpp', - 'trunk/src/effects/SkPictureImageFilter.cpp', - 'trunk/src/effects/SkPixelXorXfermode.cpp', - 'trunk/src/effects/SkPorterDuff.cpp', - 'trunk/src/effects/SkRectShaderImageFilter.cpp', - 'trunk/src/effects/SkStippleMaskFilter.cpp', - 'trunk/src/effects/SkTableColorFilter.cpp', - 'trunk/src/effects/SkTableMaskFilter.cpp', - 'trunk/src/effects/SkTestImageFilters.cpp', - 'trunk/src/effects/SkTileImageFilter.cpp', - 'trunk/src/effects/SkTransparentShader.cpp', - 'trunk/src/effects/SkXfermodeImageFilter.cpp', - 'trunk/src/fonts/SkFontMgr_indirect.cpp', - 'trunk/src/fonts/SkGScalerContext.cpp', - 'trunk/src/fonts/SkRemotableFontMgr.cpp', - 'trunk/src/fonts/SkTestScalerContext.cpp', - 'trunk/src/gpu/effects/GrBezierEffect.cpp', - 'trunk/src/gpu/effects/GrBicubicEffect.cpp', - 'trunk/src/gpu/effects/GrConfigConversionEffect.cpp', - 'trunk/src/gpu/effects/GrConvexPolyEffect.cpp', - 'trunk/src/gpu/effects/GrConvolutionEffect.cpp', - 'trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp', - 'trunk/src/gpu/effects/GrDashingEffect.cpp', - 'trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp', - 'trunk/src/gpu/effects/GrDitherEffect.cpp', - 'trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp', - 'trunk/src/gpu/effects/GrOvalEffect.cpp', - 'trunk/src/gpu/effects/GrRRectEffect.cpp', - 'trunk/src/gpu/effects/GrSimpleTextureEffect.cpp', - 'trunk/src/gpu/effects/GrSingleTextureEffect.cpp', - 'trunk/src/gpu/effects/GrTextureDomain.cpp', - 'trunk/src/gpu/effects/GrTextureStripAtlas.cpp', - 'trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp', - 'trunk/src/gpu/gl/debug/GrBufferObj.cpp', - 'trunk/src/gpu/gl/debug/GrDebugGL.cpp', - 'trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp', - 'trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', - 'trunk/src/gpu/gl/debug/GrProgramObj.cpp', - 'trunk/src/gpu/gl/debug/GrShaderObj.cpp', - 'trunk/src/gpu/gl/debug/GrTextureObj.cpp', - 'trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp', - 'trunk/src/gpu/gl/debug/SkDebugGLContext.cpp', - 'trunk/src/gpu/gl/GrGLAssembleInterface.cpp', - 'trunk/src/gpu/gl/GrGLBufferImpl.cpp', - 'trunk/src/gpu/gl/GrGLCaps.cpp', - 'trunk/src/gpu/gl/GrGLContext.cpp', - 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', - 'trunk/src/gpu/gl/GrGLCreateNullInterface.cpp', - 'trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp', - 'trunk/src/gpu/gl/GrGLExtensions.cpp', - 'trunk/src/gpu/gl/GrGLIndexBuffer.cpp', - 'trunk/src/gpu/gl/GrGLInterface.cpp', - 'trunk/src/gpu/gl/GrGLNameAllocator.cpp', - 'trunk/src/gpu/gl/GrGLNoOpInterface.cpp', - 'trunk/src/gpu/gl/GrGLPath.cpp', - 'trunk/src/gpu/gl/GrGLPathRange.cpp', - 'trunk/src/gpu/gl/GrGLProgram.cpp', - 'trunk/src/gpu/gl/GrGLProgramDesc.cpp', - 'trunk/src/gpu/gl/GrGLProgramEffects.cpp', - 'trunk/src/gpu/gl/GrGLRenderTarget.cpp', - 'trunk/src/gpu/gl/GrGLShaderBuilder.cpp', - 'trunk/src/gpu/gl/GrGLSL.cpp', - 'trunk/src/gpu/gl/GrGLStencilBuffer.cpp', - 'trunk/src/gpu/gl/GrGLTexture.cpp', - 'trunk/src/gpu/gl/GrGLUniformManager.cpp', - 'trunk/src/gpu/gl/GrGLUtil.cpp', - 'trunk/src/gpu/gl/GrGLVertexArray.cpp', - 'trunk/src/gpu/gl/GrGLVertexBuffer.cpp', - 'trunk/src/gpu/gl/GrGpuGL.cpp', - 'trunk/src/gpu/gl/GrGpuGL_program.cpp', - 'trunk/src/gpu/gl/SkGLContextHelper.cpp', - 'trunk/src/gpu/gl/SkNullGLContext.cpp', - 'trunk/src/gpu/GrAAConvexPathRenderer.cpp', - 'trunk/src/gpu/GrAAHairLinePathRenderer.cpp', - 'trunk/src/gpu/GrAARectRenderer.cpp', - 'trunk/src/gpu/GrAllocPool.cpp', - 'trunk/src/gpu/GrAtlas.cpp', - 'trunk/src/gpu/GrBitmapTextContext.cpp', - 'trunk/src/gpu/GrBlend.cpp', - 'trunk/src/gpu/GrBufferAllocPool.cpp', - 'trunk/src/gpu/GrCacheID.cpp', - 'trunk/src/gpu/GrClipData.cpp', - 'trunk/src/gpu/GrClipMaskCache.cpp', - 'trunk/src/gpu/GrClipMaskManager.cpp', - 'trunk/src/gpu/GrContext.cpp', - 'trunk/src/gpu/GrDefaultPathRenderer.cpp', - 'trunk/src/gpu/GrDrawState.cpp', - 'trunk/src/gpu/GrDrawTarget.cpp', - 'trunk/src/gpu/GrEffect.cpp', - 'trunk/src/gpu/GrFontScaler.cpp', - 'trunk/src/gpu/GrGpu.cpp', - 'trunk/src/gpu/GrGpuFactory.cpp', - 'trunk/src/gpu/GrGpuResource.cpp', - 'trunk/src/gpu/GrInOrderDrawBuffer.cpp', - 'trunk/src/gpu/GrLayerCache.cpp', - 'trunk/src/gpu/GrMemoryPool.cpp', - 'trunk/src/gpu/GrOvalRenderer.cpp', - 'trunk/src/gpu/GrPaint.cpp', - 'trunk/src/gpu/GrPath.cpp', - 'trunk/src/gpu/GrPathRenderer.cpp', - 'trunk/src/gpu/GrPathRendererChain.cpp', - 'trunk/src/gpu/GrPathUtils.cpp', - 'trunk/src/gpu/GrPictureUtils.cpp', - 'trunk/src/gpu/GrRectanizer_pow2.cpp', - 'trunk/src/gpu/GrRectanizer_skyline.cpp', - 'trunk/src/gpu/GrReducedClip.cpp', - 'trunk/src/gpu/GrRenderTarget.cpp', - 'trunk/src/gpu/GrResourceCache.cpp', - 'trunk/src/gpu/GrSoftwarePathRenderer.cpp', - 'trunk/src/gpu/GrStencil.cpp', - 'trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp', - 'trunk/src/gpu/GrStencilAndCoverTextContext.cpp', - 'trunk/src/gpu/GrStencilBuffer.cpp', - 'trunk/src/gpu/GrSurface.cpp', - 'trunk/src/gpu/GrSWMaskHelper.cpp', - 'trunk/src/gpu/GrTextContext.cpp', - 'trunk/src/gpu/GrTextStrike.cpp', - 'trunk/src/gpu/GrTexture.cpp', - 'trunk/src/gpu/GrTextureAccess.cpp', - 'trunk/src/gpu/GrTraceMarker.cpp', - 'trunk/src/gpu/SkGpuDevice.cpp', - 'trunk/src/gpu/SkGr.cpp', - 'trunk/src/gpu/SkGrPixelRef.cpp', - 'trunk/src/gpu/SkGrTexturePixelRef.cpp', - 'trunk/src/image/SkImage.cpp', - 'trunk/src/image/SkImage_Gpu.cpp', - 'trunk/src/image/SkImage_Raster.cpp', - 'trunk/src/image/SkImagePriv.cpp', - 'trunk/src/image/SkSurface.cpp', - 'trunk/src/image/SkSurface_Gpu.cpp', - 'trunk/src/image/SkSurface_Raster.cpp', - 'trunk/src/images/bmpdecoderhelper.cpp', - 'trunk/src/images/SkDecodingImageGenerator.cpp', - 'trunk/src/images/SkPageFlipper.cpp', - 'trunk/src/images/SkScaledBitmapSampler.cpp', - 'trunk/src/lazy/SkCachingPixelRef.cpp', - 'trunk/src/lazy/SkDiscardableMemoryPool.cpp', - 'trunk/src/lazy/SkDiscardablePixelRef.cpp', - 'trunk/src/pathops/SkAddIntersections.cpp', - 'trunk/src/pathops/SkDCubicIntersection.cpp', - 'trunk/src/pathops/SkDCubicLineIntersection.cpp', - 'trunk/src/pathops/SkDCubicToQuads.cpp', - 'trunk/src/pathops/SkDLineIntersection.cpp', - 'trunk/src/pathops/SkDQuadImplicit.cpp', - 'trunk/src/pathops/SkDQuadIntersection.cpp', - 'trunk/src/pathops/SkDQuadLineIntersection.cpp', - 'trunk/src/pathops/SkIntersections.cpp', - 'trunk/src/pathops/SkOpAngle.cpp', - 'trunk/src/pathops/SkOpContour.cpp', - 'trunk/src/pathops/SkOpEdgeBuilder.cpp', - 'trunk/src/pathops/SkOpSegment.cpp', - 'trunk/src/pathops/SkPathOpsBounds.cpp', - 'trunk/src/pathops/SkPathOpsCommon.cpp', - 'trunk/src/pathops/SkPathOpsCubic.cpp', - 'trunk/src/pathops/SkPathOpsDebug.cpp', - 'trunk/src/pathops/SkPathOpsLine.cpp', - 'trunk/src/pathops/SkPathOpsOp.cpp', - 'trunk/src/pathops/SkPathOpsPoint.cpp', - 'trunk/src/pathops/SkPathOpsQuad.cpp', - 'trunk/src/pathops/SkPathOpsRect.cpp', - 'trunk/src/pathops/SkPathOpsSimplify.cpp', - 'trunk/src/pathops/SkPathOpsTightBounds.cpp', - 'trunk/src/pathops/SkPathOpsTriangle.cpp', - 'trunk/src/pathops/SkPathOpsTypes.cpp', - 'trunk/src/pathops/SkPathWriter.cpp', - 'trunk/src/pathops/SkQuarticRoot.cpp', - 'trunk/src/pathops/SkReduceOrder.cpp', - 'trunk/src/pipe/SkGPipeRead.cpp', - 'trunk/src/pipe/SkGPipeWrite.cpp', - 'trunk/src/ports/SkDiscardableMemory_none.cpp', - 'trunk/src/ports/SkGlobalInitialization_default.cpp', - 'trunk/src/ports/SkImageDecoder_empty.cpp', - 'trunk/src/ports/SkMemory_mozalloc.cpp', - 'trunk/src/ports/SkOSFile_stdio.cpp', - 'trunk/src/sfnt/SkOTTable_name.cpp', - 'trunk/src/sfnt/SkOTUtils.cpp', - 'trunk/src/utils/SkBase64.cpp', - 'trunk/src/utils/SkBitSet.cpp', - 'trunk/src/utils/SkBoundaryPatch.cpp', - 'trunk/src/utils/SkCamera.cpp', - 'trunk/src/utils/SkCanvasStack.cpp', - 'trunk/src/utils/SkCanvasStateUtils.cpp', - 'trunk/src/utils/SkCubicInterval.cpp', - 'trunk/src/utils/SkCullPoints.cpp', - 'trunk/src/utils/SkDashPath.cpp', - 'trunk/src/utils/SkDeferredCanvas.cpp', - 'trunk/src/utils/SkDumpCanvas.cpp', - 'trunk/src/utils/SkEventTracer.cpp', - 'trunk/src/utils/SkFrontBufferedStream.cpp', - 'trunk/src/utils/SkGatherPixelRefsAndRects.cpp', - 'trunk/src/utils/SkInterpolator.cpp', - 'trunk/src/utils/SkLayer.cpp', - 'trunk/src/utils/SkMatrix22.cpp', - 'trunk/src/utils/SkMatrix44.cpp', - 'trunk/src/utils/SkMeshUtils.cpp', - 'trunk/src/utils/SkNinePatch.cpp', - 'trunk/src/utils/SkNullCanvas.cpp', - 'trunk/src/utils/SkNWayCanvas.cpp', - 'trunk/src/utils/SkOSFile.cpp', - 'trunk/src/utils/SkParseColor.cpp', - 'trunk/src/utils/SkParsePath.cpp', - 'trunk/src/utils/SkPathUtils.cpp', - 'trunk/src/utils/SkPictureUtils.cpp', - 'trunk/src/utils/SkProxyCanvas.cpp', - 'trunk/src/utils/SkRTConf.cpp', - 'trunk/src/utils/SkTextureCompressor.cpp', - 'trunk/src/utils/SkTextureCompressor_ASTC.cpp', - 'trunk/src/utils/SkTextureCompressor_LATC.cpp', - 'trunk/src/utils/SkTextureCompressor_R11EAC.cpp', + 'skia/src/core/SkAAClip.cpp', + 'skia/src/core/SkAlphaRuns.cpp', + 'skia/src/core/SkAnnotation.cpp', + 'skia/src/core/SkBBHFactory.cpp', + 'skia/src/core/SkBBoxHierarchyRecord.cpp', + 'skia/src/core/SkBBoxRecord.cpp', + 'skia/src/core/SkBitmap.cpp', + 'skia/src/core/SkBitmap_scroll.cpp', + 'skia/src/core/SkBitmapDevice.cpp', + 'skia/src/core/SkBitmapFilter.cpp', + 'skia/src/core/SkBitmapHeap.cpp', + 'skia/src/core/SkBitmapProcShader.cpp', + 'skia/src/core/SkBitmapProcState.cpp', + 'skia/src/core/SkBitmapScaler.cpp', + 'skia/src/core/SkBlitMask_D32.cpp', + 'skia/src/core/SkBlitRow_D16.cpp', + 'skia/src/core/SkBlitRow_D32.cpp', + 'skia/src/core/SkBlitter.cpp', + 'skia/src/core/SkBuffer.cpp', + 'skia/src/core/SkCanvas.cpp', + 'skia/src/core/SkChunkAlloc.cpp', + 'skia/src/core/SkClipStack.cpp', + 'skia/src/core/SkColor.cpp', + 'skia/src/core/SkColorFilter.cpp', + 'skia/src/core/SkColorTable.cpp', + 'skia/src/core/SkComposeShader.cpp', + 'skia/src/core/SkConfig8888.cpp', + 'skia/src/core/SkConvolver.cpp', + 'skia/src/core/SkCubicClipper.cpp', + 'skia/src/core/SkData.cpp', + 'skia/src/core/SkDataTable.cpp', + 'skia/src/core/SkDebug.cpp', + 'skia/src/core/SkDeque.cpp', + 'skia/src/core/SkDevice.cpp', + 'skia/src/core/SkDeviceLooper.cpp', + 'skia/src/core/SkDeviceProfile.cpp', + 'skia/src/core/SkDistanceFieldGen.cpp', + 'skia/src/core/SkDither.cpp', + 'skia/src/core/SkDraw.cpp', + 'skia/src/core/SkDrawLooper.cpp', + 'skia/src/core/SkEdge.cpp', + 'skia/src/core/SkEdgeBuilder.cpp', + 'skia/src/core/SkEdgeClipper.cpp', + 'skia/src/core/SkError.cpp', + 'skia/src/core/SkFilterProc.cpp', + 'skia/src/core/SkFilterShader.cpp', + 'skia/src/core/SkFlattenable.cpp', + 'skia/src/core/SkFlattenableSerialization.cpp', + 'skia/src/core/SkFloat.cpp', + 'skia/src/core/SkFloatBits.cpp', + 'skia/src/core/SkFont.cpp', + 'skia/src/core/SkFontDescriptor.cpp', + 'skia/src/core/SkFontStream.cpp', + 'skia/src/core/SkGeometry.cpp', + 'skia/src/core/SkGlyphCache.cpp', + 'skia/src/core/SkGraphics.cpp', + 'skia/src/core/SkImageFilter.cpp', + 'skia/src/core/SkImageGenerator.cpp', + 'skia/src/core/SkImageInfo.cpp', + 'skia/src/core/SkInstCnt.cpp', + 'skia/src/core/SkLineClipper.cpp', + 'skia/src/core/SkLocalMatrixShader.cpp', + 'skia/src/core/SkMallocPixelRef.cpp', + 'skia/src/core/SkMask.cpp', + 'skia/src/core/SkMaskFilter.cpp', + 'skia/src/core/SkMaskGamma.cpp', + 'skia/src/core/SkMath.cpp', + 'skia/src/core/SkMatrix.cpp', + 'skia/src/core/SkMatrixClipStateMgr.cpp', + 'skia/src/core/SkMetaData.cpp', + 'skia/src/core/SkMipMap.cpp', + 'skia/src/core/SkPackBits.cpp', + 'skia/src/core/SkPaint.cpp', + 'skia/src/core/SkPaintOptionsAndroid.cpp', + 'skia/src/core/SkPaintPriv.cpp', + 'skia/src/core/SkPatch.cpp', + 'skia/src/core/SkPath.cpp', + 'skia/src/core/SkPathEffect.cpp', + 'skia/src/core/SkPathHeap.cpp', + 'skia/src/core/SkPathMeasure.cpp', + 'skia/src/core/SkPathRef.cpp', + 'skia/src/core/SkPicture.cpp', + 'skia/src/core/SkPictureFlat.cpp', + 'skia/src/core/SkPicturePlayback.cpp', + 'skia/src/core/SkPictureRangePlayback.cpp', + 'skia/src/core/SkPictureRecord.cpp', + 'skia/src/core/SkPictureRecorder.cpp', + 'skia/src/core/SkPictureReplacementPlayback.cpp', + 'skia/src/core/SkPictureShader.cpp', + 'skia/src/core/SkPictureStateTree.cpp', + 'skia/src/core/SkPixelRef.cpp', + 'skia/src/core/SkPoint.cpp', + 'skia/src/core/SkProcSpriteBlitter.cpp', + 'skia/src/core/SkPtrRecorder.cpp', + 'skia/src/core/SkQuadClipper.cpp', + 'skia/src/core/SkQuadTree.cpp', + 'skia/src/core/SkRasterClip.cpp', + 'skia/src/core/SkRasterizer.cpp', + 'skia/src/core/SkReadBuffer.cpp', + 'skia/src/core/SkRecordAnalysis.cpp', + 'skia/src/core/SkRecordDraw.cpp', + 'skia/src/core/SkRecorder.cpp', + 'skia/src/core/SkRecording.cpp', + 'skia/src/core/SkRecordOpts.cpp', + 'skia/src/core/SkRect.cpp', + 'skia/src/core/SkRefDict.cpp', + 'skia/src/core/SkRegion.cpp', + 'skia/src/core/SkRegion_path.cpp', + 'skia/src/core/SkRRect.cpp', + 'skia/src/core/SkRTree.cpp', + 'skia/src/core/SkScalar.cpp', + 'skia/src/core/SkScalerContext.cpp', + 'skia/src/core/SkScan.cpp', + 'skia/src/core/SkScan_AntiPath.cpp', + 'skia/src/core/SkScan_Hairline.cpp', + 'skia/src/core/SkScan_Path.cpp', + 'skia/src/core/SkShader.cpp', + 'skia/src/core/SkSpriteBlitter_ARGB32.cpp', + 'skia/src/core/SkSpriteBlitter_RGB16.cpp', + 'skia/src/core/SkStream.cpp', + 'skia/src/core/SkString.cpp', + 'skia/src/core/SkStringUtils.cpp', + 'skia/src/core/SkStroke.cpp', + 'skia/src/core/SkStrokeRec.cpp', + 'skia/src/core/SkStrokerPriv.cpp', + 'skia/src/core/SkTileGrid.cpp', + 'skia/src/core/SkTLS.cpp', + 'skia/src/core/SkTSearch.cpp', + 'skia/src/core/SkTypeface.cpp', + 'skia/src/core/SkTypefaceCache.cpp', + 'skia/src/core/SkUnPreMultiply.cpp', + 'skia/src/core/SkUtils.cpp', + 'skia/src/core/SkValidatingReadBuffer.cpp', + 'skia/src/core/SkVertState.cpp', + 'skia/src/core/SkWriteBuffer.cpp', + 'skia/src/core/SkWriter32.cpp', + 'skia/src/core/SkXfermode.cpp', + 'skia/src/doc/SkDocument.cpp', + 'skia/src/effects/gradients/SkBitmapCache.cpp', + 'skia/src/effects/gradients/SkClampRange.cpp', + 'skia/src/effects/gradients/SkGradientShader.cpp', + 'skia/src/effects/gradients/SkLinearGradient.cpp', + 'skia/src/effects/gradients/SkRadialGradient.cpp', + 'skia/src/effects/gradients/SkSweepGradient.cpp', + 'skia/src/effects/gradients/SkTwoPointConicalGradient.cpp', + 'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', + 'skia/src/effects/gradients/SkTwoPointRadialGradient.cpp', + 'skia/src/effects/Sk1DPathEffect.cpp', + 'skia/src/effects/Sk2DPathEffect.cpp', + 'skia/src/effects/SkAlphaThresholdFilter.cpp', + 'skia/src/effects/SkArithmeticMode.cpp', + 'skia/src/effects/SkAvoidXfermode.cpp', + 'skia/src/effects/SkBitmapSource.cpp', + 'skia/src/effects/SkBlurDrawLooper.cpp', + 'skia/src/effects/SkBlurImageFilter.cpp', + 'skia/src/effects/SkBlurMask.cpp', + 'skia/src/effects/SkBlurMaskFilter.cpp', + 'skia/src/effects/SkColorFilterImageFilter.cpp', + 'skia/src/effects/SkColorFilters.cpp', + 'skia/src/effects/SkColorMatrix.cpp', + 'skia/src/effects/SkColorMatrixFilter.cpp', + 'skia/src/effects/SkComposeImageFilter.cpp', + 'skia/src/effects/SkCornerPathEffect.cpp', + 'skia/src/effects/SkDashPathEffect.cpp', + 'skia/src/effects/SkDiscretePathEffect.cpp', + 'skia/src/effects/SkDisplacementMapEffect.cpp', + 'skia/src/effects/SkDropShadowImageFilter.cpp', + 'skia/src/effects/SkEmbossMask.cpp', + 'skia/src/effects/SkEmbossMaskFilter.cpp', + 'skia/src/effects/SkGpuBlurUtils.cpp', + 'skia/src/effects/SkLayerDrawLooper.cpp', + 'skia/src/effects/SkLayerRasterizer.cpp', + 'skia/src/effects/SkLerpXfermode.cpp', + 'skia/src/effects/SkLightingImageFilter.cpp', + 'skia/src/effects/SkLumaColorFilter.cpp', + 'skia/src/effects/SkMagnifierImageFilter.cpp', + 'skia/src/effects/SkMatrixConvolutionImageFilter.cpp', + 'skia/src/effects/SkMatrixImageFilter.cpp', + 'skia/src/effects/SkMergeImageFilter.cpp', + 'skia/src/effects/SkMorphologyImageFilter.cpp', + 'skia/src/effects/SkOffsetImageFilter.cpp', + 'skia/src/effects/SkPaintFlagsDrawFilter.cpp', + 'skia/src/effects/SkPerlinNoiseShader.cpp', + 'skia/src/effects/SkPictureImageFilter.cpp', + 'skia/src/effects/SkPixelXorXfermode.cpp', + 'skia/src/effects/SkPorterDuff.cpp', + 'skia/src/effects/SkRectShaderImageFilter.cpp', + 'skia/src/effects/SkStippleMaskFilter.cpp', + 'skia/src/effects/SkTableColorFilter.cpp', + 'skia/src/effects/SkTableMaskFilter.cpp', + 'skia/src/effects/SkTestImageFilters.cpp', + 'skia/src/effects/SkTileImageFilter.cpp', + 'skia/src/effects/SkTransparentShader.cpp', + 'skia/src/effects/SkXfermodeImageFilter.cpp', + 'skia/src/fonts/SkFontMgr_indirect.cpp', + 'skia/src/fonts/SkGScalerContext.cpp', + 'skia/src/fonts/SkRemotableFontMgr.cpp', + 'skia/src/fonts/SkTestScalerContext.cpp', + 'skia/src/gpu/effects/GrBezierEffect.cpp', + 'skia/src/gpu/effects/GrBicubicEffect.cpp', + 'skia/src/gpu/effects/GrConfigConversionEffect.cpp', + 'skia/src/gpu/effects/GrConvexPolyEffect.cpp', + 'skia/src/gpu/effects/GrConvolutionEffect.cpp', + 'skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp', + 'skia/src/gpu/effects/GrDashingEffect.cpp', + 'skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp', + 'skia/src/gpu/effects/GrDitherEffect.cpp', + 'skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp', + 'skia/src/gpu/effects/GrOvalEffect.cpp', + 'skia/src/gpu/effects/GrRRectEffect.cpp', + 'skia/src/gpu/effects/GrSimpleTextureEffect.cpp', + 'skia/src/gpu/effects/GrSingleTextureEffect.cpp', + 'skia/src/gpu/effects/GrTextureDomain.cpp', + 'skia/src/gpu/effects/GrTextureStripAtlas.cpp', + 'skia/src/gpu/effects/GrYUVtoRGBEffect.cpp', + 'skia/src/gpu/gl/debug/GrBufferObj.cpp', + 'skia/src/gpu/gl/debug/GrDebugGL.cpp', + 'skia/src/gpu/gl/debug/GrFrameBufferObj.cpp', + 'skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp', + 'skia/src/gpu/gl/debug/GrProgramObj.cpp', + 'skia/src/gpu/gl/debug/GrShaderObj.cpp', + 'skia/src/gpu/gl/debug/GrTextureObj.cpp', + 'skia/src/gpu/gl/debug/GrTextureUnitObj.cpp', + 'skia/src/gpu/gl/debug/SkDebugGLContext.cpp', + 'skia/src/gpu/gl/GrGLAssembleInterface.cpp', + 'skia/src/gpu/gl/GrGLBufferImpl.cpp', + 'skia/src/gpu/gl/GrGLCaps.cpp', + 'skia/src/gpu/gl/GrGLContext.cpp', + 'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', + 'skia/src/gpu/gl/GrGLCreateNullInterface.cpp', + 'skia/src/gpu/gl/GrGLDefaultInterface_native.cpp', + 'skia/src/gpu/gl/GrGLExtensions.cpp', + 'skia/src/gpu/gl/GrGLIndexBuffer.cpp', + 'skia/src/gpu/gl/GrGLInterface.cpp', + 'skia/src/gpu/gl/GrGLNameAllocator.cpp', + 'skia/src/gpu/gl/GrGLNoOpInterface.cpp', + 'skia/src/gpu/gl/GrGLPath.cpp', + 'skia/src/gpu/gl/GrGLPathRange.cpp', + 'skia/src/gpu/gl/GrGLProgram.cpp', + 'skia/src/gpu/gl/GrGLProgramDesc.cpp', + 'skia/src/gpu/gl/GrGLProgramEffects.cpp', + 'skia/src/gpu/gl/GrGLRenderTarget.cpp', + 'skia/src/gpu/gl/GrGLShaderBuilder.cpp', + 'skia/src/gpu/gl/GrGLSL.cpp', + 'skia/src/gpu/gl/GrGLStencilBuffer.cpp', + 'skia/src/gpu/gl/GrGLTexture.cpp', + 'skia/src/gpu/gl/GrGLUniformManager.cpp', + 'skia/src/gpu/gl/GrGLUtil.cpp', + 'skia/src/gpu/gl/GrGLVertexArray.cpp', + 'skia/src/gpu/gl/GrGLVertexBuffer.cpp', + 'skia/src/gpu/gl/GrGpuGL.cpp', + 'skia/src/gpu/gl/GrGpuGL_program.cpp', + 'skia/src/gpu/gl/SkGLContextHelper.cpp', + 'skia/src/gpu/gl/SkNullGLContext.cpp', + 'skia/src/gpu/GrAAConvexPathRenderer.cpp', + 'skia/src/gpu/GrAAHairLinePathRenderer.cpp', + 'skia/src/gpu/GrAARectRenderer.cpp', + 'skia/src/gpu/GrAllocPool.cpp', + 'skia/src/gpu/GrAtlas.cpp', + 'skia/src/gpu/GrBitmapTextContext.cpp', + 'skia/src/gpu/GrBlend.cpp', + 'skia/src/gpu/GrBufferAllocPool.cpp', + 'skia/src/gpu/GrCacheID.cpp', + 'skia/src/gpu/GrClipData.cpp', + 'skia/src/gpu/GrClipMaskCache.cpp', + 'skia/src/gpu/GrClipMaskManager.cpp', + 'skia/src/gpu/GrContext.cpp', + 'skia/src/gpu/GrDefaultPathRenderer.cpp', + 'skia/src/gpu/GrDrawState.cpp', + 'skia/src/gpu/GrDrawTarget.cpp', + 'skia/src/gpu/GrEffect.cpp', + 'skia/src/gpu/GrFontScaler.cpp', + 'skia/src/gpu/GrGpu.cpp', + 'skia/src/gpu/GrGpuFactory.cpp', + 'skia/src/gpu/GrGpuResource.cpp', + 'skia/src/gpu/GrInOrderDrawBuffer.cpp', + 'skia/src/gpu/GrLayerCache.cpp', + 'skia/src/gpu/GrMemoryPool.cpp', + 'skia/src/gpu/GrOvalRenderer.cpp', + 'skia/src/gpu/GrPaint.cpp', + 'skia/src/gpu/GrPath.cpp', + 'skia/src/gpu/GrPathRenderer.cpp', + 'skia/src/gpu/GrPathRendererChain.cpp', + 'skia/src/gpu/GrPathUtils.cpp', + 'skia/src/gpu/GrPictureUtils.cpp', + 'skia/src/gpu/GrRectanizer_pow2.cpp', + 'skia/src/gpu/GrRectanizer_skyline.cpp', + 'skia/src/gpu/GrReducedClip.cpp', + 'skia/src/gpu/GrRenderTarget.cpp', + 'skia/src/gpu/GrResourceCache.cpp', + 'skia/src/gpu/GrSoftwarePathRenderer.cpp', + 'skia/src/gpu/GrStencil.cpp', + 'skia/src/gpu/GrStencilAndCoverPathRenderer.cpp', + 'skia/src/gpu/GrStencilAndCoverTextContext.cpp', + 'skia/src/gpu/GrStencilBuffer.cpp', + 'skia/src/gpu/GrSurface.cpp', + 'skia/src/gpu/GrSWMaskHelper.cpp', + 'skia/src/gpu/GrTextContext.cpp', + 'skia/src/gpu/GrTextStrike.cpp', + 'skia/src/gpu/GrTexture.cpp', + 'skia/src/gpu/GrTextureAccess.cpp', + 'skia/src/gpu/GrTraceMarker.cpp', + 'skia/src/gpu/SkGpuDevice.cpp', + 'skia/src/gpu/SkGr.cpp', + 'skia/src/gpu/SkGrPixelRef.cpp', + 'skia/src/gpu/SkGrTexturePixelRef.cpp', + 'skia/src/image/SkImage.cpp', + 'skia/src/image/SkImage_Gpu.cpp', + 'skia/src/image/SkImage_Raster.cpp', + 'skia/src/image/SkImagePriv.cpp', + 'skia/src/image/SkSurface.cpp', + 'skia/src/image/SkSurface_Gpu.cpp', + 'skia/src/image/SkSurface_Raster.cpp', + 'skia/src/images/bmpdecoderhelper.cpp', + 'skia/src/images/SkDecodingImageGenerator.cpp', + 'skia/src/images/SkPageFlipper.cpp', + 'skia/src/images/SkScaledBitmapSampler.cpp', + 'skia/src/lazy/SkCachingPixelRef.cpp', + 'skia/src/lazy/SkDiscardableMemoryPool.cpp', + 'skia/src/lazy/SkDiscardablePixelRef.cpp', + 'skia/src/pathops/SkAddIntersections.cpp', + 'skia/src/pathops/SkDCubicIntersection.cpp', + 'skia/src/pathops/SkDCubicLineIntersection.cpp', + 'skia/src/pathops/SkDCubicToQuads.cpp', + 'skia/src/pathops/SkDLineIntersection.cpp', + 'skia/src/pathops/SkDQuadImplicit.cpp', + 'skia/src/pathops/SkDQuadIntersection.cpp', + 'skia/src/pathops/SkDQuadLineIntersection.cpp', + 'skia/src/pathops/SkIntersections.cpp', + 'skia/src/pathops/SkOpAngle.cpp', + 'skia/src/pathops/SkOpContour.cpp', + 'skia/src/pathops/SkOpEdgeBuilder.cpp', + 'skia/src/pathops/SkOpSegment.cpp', + 'skia/src/pathops/SkPathOpsBounds.cpp', + 'skia/src/pathops/SkPathOpsCommon.cpp', + 'skia/src/pathops/SkPathOpsCubic.cpp', + 'skia/src/pathops/SkPathOpsDebug.cpp', + 'skia/src/pathops/SkPathOpsLine.cpp', + 'skia/src/pathops/SkPathOpsOp.cpp', + 'skia/src/pathops/SkPathOpsPoint.cpp', + 'skia/src/pathops/SkPathOpsQuad.cpp', + 'skia/src/pathops/SkPathOpsRect.cpp', + 'skia/src/pathops/SkPathOpsSimplify.cpp', + 'skia/src/pathops/SkPathOpsTightBounds.cpp', + 'skia/src/pathops/SkPathOpsTriangle.cpp', + 'skia/src/pathops/SkPathOpsTypes.cpp', + 'skia/src/pathops/SkPathWriter.cpp', + 'skia/src/pathops/SkQuarticRoot.cpp', + 'skia/src/pathops/SkReduceOrder.cpp', + 'skia/src/pipe/SkGPipeRead.cpp', + 'skia/src/pipe/SkGPipeWrite.cpp', + 'skia/src/ports/SkDiscardableMemory_none.cpp', + 'skia/src/ports/SkGlobalInitialization_default.cpp', + 'skia/src/ports/SkImageDecoder_empty.cpp', + 'skia/src/ports/SkMemory_mozalloc.cpp', + 'skia/src/ports/SkOSFile_stdio.cpp', + 'skia/src/sfnt/SkOTTable_name.cpp', + 'skia/src/sfnt/SkOTUtils.cpp', + 'skia/src/utils/SkBase64.cpp', + 'skia/src/utils/SkBitSet.cpp', + 'skia/src/utils/SkBoundaryPatch.cpp', + 'skia/src/utils/SkCamera.cpp', + 'skia/src/utils/SkCanvasStack.cpp', + 'skia/src/utils/SkCanvasStateUtils.cpp', + 'skia/src/utils/SkCubicInterval.cpp', + 'skia/src/utils/SkCullPoints.cpp', + 'skia/src/utils/SkDashPath.cpp', + 'skia/src/utils/SkDeferredCanvas.cpp', + 'skia/src/utils/SkDumpCanvas.cpp', + 'skia/src/utils/SkEventTracer.cpp', + 'skia/src/utils/SkFrontBufferedStream.cpp', + 'skia/src/utils/SkGatherPixelRefsAndRects.cpp', + 'skia/src/utils/SkInterpolator.cpp', + 'skia/src/utils/SkLayer.cpp', + 'skia/src/utils/SkMatrix22.cpp', + 'skia/src/utils/SkMatrix44.cpp', + 'skia/src/utils/SkMeshUtils.cpp', + 'skia/src/utils/SkNinePatch.cpp', + 'skia/src/utils/SkNullCanvas.cpp', + 'skia/src/utils/SkNWayCanvas.cpp', + 'skia/src/utils/SkOSFile.cpp', + 'skia/src/utils/SkParseColor.cpp', + 'skia/src/utils/SkParsePath.cpp', + 'skia/src/utils/SkPathUtils.cpp', + 'skia/src/utils/SkPictureUtils.cpp', + 'skia/src/utils/SkProxyCanvas.cpp', + 'skia/src/utils/SkRTConf.cpp', + 'skia/src/utils/SkTextureCompressor.cpp', + 'skia/src/utils/SkTextureCompressor_ASTC.cpp', + 'skia/src/utils/SkTextureCompressor_LATC.cpp', + 'skia/src/utils/SkTextureCompressor_R11EAC.cpp', ] SOURCES += [ - 'trunk/src/core/SkAdvancedTypefaceMetrics.cpp', - 'trunk/src/core/SkBitmapProcState_matrixProcs.cpp', - 'trunk/src/core/SkBlitter_A8.cpp', - 'trunk/src/core/SkBlitter_ARGB32.cpp', - 'trunk/src/core/SkBlitter_RGB16.cpp', - 'trunk/src/core/SkBlitter_Sprite.cpp', - 'trunk/src/core/SkFontHost.cpp', - 'trunk/src/core/SkPictureData.cpp', - 'trunk/src/core/SkScaledImageCache.cpp', - 'trunk/src/core/SkScan_Antihair.cpp', - 'trunk/src/gpu/GrAddPathRenderers_default.cpp', - 'trunk/src/gpu/GrDistanceFieldTextContext.cpp', - 'trunk/src/utils/SkMD5.cpp', - 'trunk/src/utils/SkParse.cpp', - 'trunk/src/utils/SkSHA1.cpp', + 'skia/src/core/SkAdvancedTypefaceMetrics.cpp', + 'skia/src/core/SkBitmapProcState_matrixProcs.cpp', + 'skia/src/core/SkBlitter_A8.cpp', + 'skia/src/core/SkBlitter_ARGB32.cpp', + 'skia/src/core/SkBlitter_RGB16.cpp', + 'skia/src/core/SkBlitter_Sprite.cpp', + 'skia/src/core/SkFontHost.cpp', + 'skia/src/core/SkPictureData.cpp', + 'skia/src/core/SkScaledImageCache.cpp', + 'skia/src/core/SkScan_Antihair.cpp', + 'skia/src/gpu/GrAddPathRenderers_default.cpp', + 'skia/src/gpu/GrDistanceFieldTextContext.cpp', + 'skia/src/utils/SkMD5.cpp', + 'skia/src/utils/SkParse.cpp', + 'skia/src/utils/SkSHA1.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'): UNIFIED_SOURCES += [ - 'trunk/src/ports/SkDebug_android.cpp', - 'trunk/src/ports/SkOSFile_posix.cpp', - 'trunk/src/ports/SkTime_Unix.cpp', - 'trunk/src/ports/SkTLS_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread.cpp', + 'skia/src/ports/SkDebug_android.cpp', + 'skia/src/ports/SkOSFile_posix.cpp', + 'skia/src/ports/SkTime_Unix.cpp', + 'skia/src/ports/SkTLS_pthread.cpp', + 'skia/src/utils/SkThreadUtils_pthread.cpp', ] SOURCES += [ - 'trunk/src/ports/SkFontHost_android_old.cpp', - 'trunk/src/ports/SkFontHost_cairo.cpp', - 'trunk/src/ports/SkFontHost_FreeType.cpp', - 'trunk/src/ports/SkFontHost_FreeType_common.cpp', + 'skia/src/ports/SkFontHost_android_old.cpp', + 'skia/src/ports/SkFontHost_cairo.cpp', + 'skia/src/ports/SkFontHost_FreeType.cpp', + 'skia/src/ports/SkFontHost_FreeType_common.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += [ - 'trunk/src/ports/SkDebug_stdio.cpp', - 'trunk/src/ports/SkOSFile_posix.cpp', - 'trunk/src/ports/SkTime_Unix.cpp', - 'trunk/src/ports/SkTLS_pthread.cpp', - 'trunk/src/utils/mac/SkCreateCGImageRef.cpp', - 'trunk/src/utils/mac/SkStream_mac.cpp', - 'trunk/src/utils/SkThreadUtils_pthread.cpp', + 'skia/src/ports/SkDebug_stdio.cpp', + 'skia/src/ports/SkOSFile_posix.cpp', + 'skia/src/ports/SkTime_Unix.cpp', + 'skia/src/ports/SkTLS_pthread.cpp', + 'skia/src/utils/mac/SkCreateCGImageRef.cpp', + 'skia/src/utils/mac/SkStream_mac.cpp', + 'skia/src/utils/SkThreadUtils_pthread.cpp', ] SOURCES += [ - 'trunk/src/ports/SkFontHost_mac.cpp', + 'skia/src/ports/SkFontHost_mac.cpp', ] if CONFIG['MOZ_WIDGET_GTK']: UNIFIED_SOURCES += [ - 'trunk/src/ports/SkDebug_stdio.cpp', - 'trunk/src/ports/SkOSFile_posix.cpp', - 'trunk/src/ports/SkTime_Unix.cpp', - 'trunk/src/ports/SkTLS_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread.cpp', + 'skia/src/ports/SkDebug_stdio.cpp', + 'skia/src/ports/SkOSFile_posix.cpp', + 'skia/src/ports/SkTime_Unix.cpp', + 'skia/src/ports/SkTLS_pthread.cpp', + 'skia/src/utils/SkThreadUtils_pthread.cpp', ] SOURCES += [ - 'trunk/src/ports/SkFontHost_cairo.cpp', - 'trunk/src/ports/SkFontHost_FreeType.cpp', - 'trunk/src/ports/SkFontHost_FreeType_common.cpp', + 'skia/src/ports/SkFontHost_cairo.cpp', + 'skia/src/ports/SkFontHost_FreeType.cpp', + 'skia/src/ports/SkFontHost_FreeType_common.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': UNIFIED_SOURCES += [ - 'trunk/src/ports/SkDebug_stdio.cpp', - 'trunk/src/ports/SkOSFile_posix.cpp', - 'trunk/src/ports/SkTime_Unix.cpp', - 'trunk/src/ports/SkTLS_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread.cpp', + 'skia/src/ports/SkDebug_stdio.cpp', + 'skia/src/ports/SkOSFile_posix.cpp', + 'skia/src/ports/SkTime_Unix.cpp', + 'skia/src/ports/SkTLS_pthread.cpp', + 'skia/src/utils/SkThreadUtils_pthread.cpp', ] SOURCES += [ - 'trunk/src/ports/SkFontHost_cairo.cpp', - 'trunk/src/ports/SkFontHost_FreeType.cpp', - 'trunk/src/ports/SkFontHost_FreeType_common.cpp', + 'skia/src/ports/SkFontHost_cairo.cpp', + 'skia/src/ports/SkFontHost_FreeType.cpp', + 'skia/src/ports/SkFontHost_FreeType_common.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': SOURCES += [ - 'trunk/src/ports/SkDebug_win.cpp', - 'trunk/src/ports/SkFontHost_win.cpp', - 'trunk/src/ports/SkFontMgr_default_dw.cpp', - 'trunk/src/ports/SkFontMgr_win_dw.cpp', - 'trunk/src/ports/SkOSFile_win.cpp', - 'trunk/src/ports/SkRemotableFontMgr_win_dw.cpp', - 'trunk/src/ports/SkScalerContext_win_dw.cpp', - 'trunk/src/ports/SkTime_win.cpp', - 'trunk/src/ports/SkTLS_win.cpp', - 'trunk/src/ports/SkTypeface_win_dw.cpp', - 'trunk/src/utils/SkThreadUtils_win.cpp', - 'trunk/src/utils/win/SkAutoCoInitialize.cpp', - 'trunk/src/utils/win/SkDWrite.cpp', - 'trunk/src/utils/win/SkDWriteFontFileStream.cpp', - 'trunk/src/utils/win/SkDWriteGeometrySink.cpp', - 'trunk/src/utils/win/SkHRESULT.cpp', - 'trunk/src/utils/win/SkIStream.cpp', + 'skia/src/ports/SkDebug_win.cpp', + 'skia/src/ports/SkFontHost_win.cpp', + 'skia/src/ports/SkFontMgr_default_dw.cpp', + 'skia/src/ports/SkFontMgr_win_dw.cpp', + 'skia/src/ports/SkOSFile_win.cpp', + 'skia/src/ports/SkRemotableFontMgr_win_dw.cpp', + 'skia/src/ports/SkScalerContext_win_dw.cpp', + 'skia/src/ports/SkTime_win.cpp', + 'skia/src/ports/SkTLS_win.cpp', + 'skia/src/ports/SkTypeface_win_dw.cpp', + 'skia/src/utils/SkThreadUtils_win.cpp', + 'skia/src/utils/win/SkAutoCoInitialize.cpp', + 'skia/src/utils/win/SkDWrite.cpp', + 'skia/src/utils/win/SkDWriteFontFileStream.cpp', + 'skia/src/utils/win/SkDWriteGeometrySink.cpp', + 'skia/src/utils/win/SkHRESULT.cpp', + 'skia/src/utils/win/SkIStream.cpp', ] if CONFIG['INTEL_ARCHITECTURE']: UNIFIED_SOURCES += [ - 'trunk/src/opts/SkTextureCompression_opts_none.cpp', + 'skia/src/opts/SkTextureCompression_opts_none.cpp', ] SOURCES += [ - 'trunk/src/opts/opts_check_x86.cpp', - 'trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp', - 'trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp', - 'trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp', - 'trunk/src/opts/SkBlitRect_opts_SSE2.cpp', - 'trunk/src/opts/SkBlitRow_opts_SSE2.cpp', - 'trunk/src/opts/SkBlurImage_opts_SSE2.cpp', - 'trunk/src/opts/SkBlurImage_opts_SSE4.cpp', - 'trunk/src/opts/SkMorphology_opts_SSE2.cpp', - 'trunk/src/opts/SkUtils_opts_SSE2.cpp', - 'trunk/src/opts/SkXfermode_opts_SSE2.cpp', + 'skia/src/opts/opts_check_x86.cpp', + 'skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', + 'skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', + 'skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp', + 'skia/src/opts/SkBlitRect_opts_SSE2.cpp', + 'skia/src/opts/SkBlitRow_opts_SSE2.cpp', + 'skia/src/opts/SkBlurImage_opts_SSE2.cpp', + 'skia/src/opts/SkBlurImage_opts_SSE4.cpp', + 'skia/src/opts/SkMorphology_opts_SSE2.cpp', + 'skia/src/opts/SkUtils_opts_SSE2.cpp', + 'skia/src/opts/SkXfermode_opts_SSE2.cpp', ] elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: UNIFIED_SOURCES += [ - 'trunk/src/core/SkUtilsArm.cpp', - 'trunk/src/opts/SkBitmapProcState_opts_arm.cpp', - 'trunk/src/opts/SkBlitMask_opts_arm.cpp', - 'trunk/src/opts/SkBlurImage_opts_arm.cpp', - 'trunk/src/opts/SkMorphology_opts_arm.cpp', - 'trunk/src/opts/SkTextureCompression_opts_arm.cpp', - 'trunk/src/opts/SkUtils_opts_arm.cpp', - 'trunk/src/opts/SkXfermode_opts_arm.cpp', + 'skia/src/core/SkUtilsArm.cpp', + 'skia/src/opts/SkBitmapProcState_opts_arm.cpp', + 'skia/src/opts/SkBlitMask_opts_arm.cpp', + 'skia/src/opts/SkBlurImage_opts_arm.cpp', + 'skia/src/opts/SkMorphology_opts_arm.cpp', + 'skia/src/opts/SkTextureCompression_opts_arm.cpp', + 'skia/src/opts/SkUtils_opts_arm.cpp', + 'skia/src/opts/SkXfermode_opts_arm.cpp', ] SOURCES += [ - 'trunk/src/opts/SkBlitRow_opts_arm.cpp', + 'skia/src/opts/SkBlitRow_opts_arm.cpp', ] if CONFIG['BUILD_ARM_NEON']: SOURCES += [ - 'trunk/src/opts/SkBitmapProcState_arm_neon.cpp', - 'trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', - 'trunk/src/opts/SkBlitMask_opts_arm_neon.cpp', - 'trunk/src/opts/SkBlitRow_opts_arm_neon.cpp', - 'trunk/src/opts/SkBlurImage_opts_neon.cpp', - 'trunk/src/opts/SkMorphology_opts_neon.cpp', - 'trunk/src/opts/SkTextureCompression_opts_neon.cpp', - 'trunk/src/opts/SkXfermode_opts_arm_neon.cpp', + 'skia/src/opts/SkBitmapProcState_arm_neon.cpp', + 'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', + 'skia/src/opts/SkBlitMask_opts_arm_neon.cpp', + 'skia/src/opts/SkBlitRow_opts_arm_neon.cpp', + 'skia/src/opts/SkBlurImage_opts_neon.cpp', + 'skia/src/opts/SkMorphology_opts_neon.cpp', + 'skia/src/opts/SkTextureCompression_opts_neon.cpp', + 'skia/src/opts/SkXfermode_opts_arm_neon.cpp', ] - SOURCES['trunk/src/opts/SkBitmapProcState_arm_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkBlitMask_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkBlitRow_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkBlurImage_opts_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkMorphology_opts_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkTextureCompression_opts_neon.cpp'].flags += ['-mfpu=neon'] - SOURCES['trunk/src/opts/SkXfermode_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkBitmapProcState_arm_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkBlitMask_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkBlitRow_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkBlurImage_opts_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkMorphology_opts_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkTextureCompression_opts_neon.cpp'].flags += ['-mfpu=neon'] + SOURCES['skia/src/opts/SkXfermode_opts_arm_neon.cpp'].flags += ['-mfpu=neon'] else: UNIFIED_SOURCES += [ - 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', - 'trunk/src/opts/SkBlitMask_opts_none.cpp', - 'trunk/src/opts/SkBlitRow_opts_none.cpp', - 'trunk/src/opts/SkBlurImage_opts_none.cpp', - 'trunk/src/opts/SkMorphology_opts_none.cpp', - 'trunk/src/opts/SkTextureCompression_opts_none.cpp', - 'trunk/src/opts/SkUtils_opts_none.cpp', - 'trunk/src/opts/SkXfermode_opts_none.cpp', - 'trunk/src/ports/SkDiscardableMemory_none.cpp', + 'skia/src/opts/SkBitmapProcState_opts_none.cpp', + 'skia/src/opts/SkBlitMask_opts_none.cpp', + 'skia/src/opts/SkBlitRow_opts_none.cpp', + 'skia/src/opts/SkBlurImage_opts_none.cpp', + 'skia/src/opts/SkMorphology_opts_none.cpp', + 'skia/src/opts/SkTextureCompression_opts_none.cpp', + 'skia/src/opts/SkUtils_opts_none.cpp', + 'skia/src/opts/SkXfermode_opts_none.cpp', + 'skia/src/ports/SkDiscardableMemory_none.cpp', ] @@ -863,51 +565,51 @@ else: # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: SOURCES += [ - 'trunk/src/opts/memset.arm.S', + 'skia/src/opts/memset.arm.S', ] if CONFIG['BUILD_ARM_NEON']: SOURCES += [ - 'trunk/src/opts/memset16_neon.S', - 'trunk/src/opts/memset32_neon.S', + 'skia/src/opts/memset16_neon.S', + 'skia/src/opts/memset32_neon.S', ] if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT': if CONFIG['CPU_ARCH'] == 'x86_64': SOURCES += [ - 'trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S', + 'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S', ] else: SOURCES += [ - 'trunk/src/opts/SkBlitRow_opts_SSE4_asm.S', + 'skia/src/opts/SkBlitRow_opts_SSE4_asm.S', ] MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'gkmedias' LOCAL_INCLUDES += [ - 'trunk/include/config', - 'trunk/include/core', - 'trunk/include/effects', - 'trunk/include/gpu', - 'trunk/include/images', - 'trunk/include/pathops', - 'trunk/include/pipe', - 'trunk/include/ports', - 'trunk/include/utils', - 'trunk/include/utils/mac', - 'trunk/include/utils/win', - 'trunk/include/views', - 'trunk/src/core', - 'trunk/src/gpu', - 'trunk/src/gpu/effects', - 'trunk/src/gpu/gl', - 'trunk/src/image', - 'trunk/src/lazy', - 'trunk/src/opts', - 'trunk/src/sfnt', - 'trunk/src/utils', - 'trunk/src/utils/mac', - 'trunk/src/utils/win', + 'skia/include/config', + 'skia/include/core', + 'skia/include/effects', + 'skia/include/gpu', + 'skia/include/images', + 'skia/include/pathops', + 'skia/include/pipe', + 'skia/include/ports', + 'skia/include/utils', + 'skia/include/utils/mac', + 'skia/include/utils/win', + 'skia/include/views', + 'skia/src/core', + 'skia/src/gpu', + 'skia/src/gpu/effects', + 'skia/src/gpu/gl', + 'skia/src/image', + 'skia/src/lazy', + 'skia/src/opts', + 'skia/src/sfnt', + 'skia/src/utils', + 'skia/src/utils/mac', + 'skia/src/utils/win', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa'): @@ -931,37 +633,37 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: if CONFIG['_MSC_VER']: # MSVC doesn't need special compiler flags, but Skia needs to be told that these files should # be built with the required SSE level or it will simply compile in stubs and cause runtime crashes - SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31'] - SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41'] - SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] - SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31'] + SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41'] + SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] + SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20'] if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']: - SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] - SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] - SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] + SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] + SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']: DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1 DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0 elif CONFIG['CLANG_CL']: - SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] - SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] + SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] + SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] if CONFIG['GNU_CXX'] and CONFIG['CPU_ARCH'] == 'arm': - SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] + SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] DEFINES['SKIA_IMPLEMENTATION'] = 1 DEFINES['GR_IMPLEMENTATION'] = 1 diff --git a/gfx/skia/trunk/include/animator/SkAnimator.h b/gfx/skia/skia/include/animator/SkAnimator.h similarity index 100% rename from gfx/skia/trunk/include/animator/SkAnimator.h rename to gfx/skia/skia/include/animator/SkAnimator.h diff --git a/gfx/skia/trunk/include/animator/SkAnimatorView.h b/gfx/skia/skia/include/animator/SkAnimatorView.h similarity index 100% rename from gfx/skia/trunk/include/animator/SkAnimatorView.h rename to gfx/skia/skia/include/animator/SkAnimatorView.h diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/skia/include/config/SkUserConfig.h similarity index 95% rename from gfx/skia/trunk/include/config/SkUserConfig.h rename to gfx/skia/skia/include/config/SkUserConfig.h index 36e0a853ce..3d21b4c689 100644 --- a/gfx/skia/trunk/include/config/SkUserConfig.h +++ b/gfx/skia/skia/include/config/SkUserConfig.h @@ -179,21 +179,21 @@ //#define SK_ATOMICS_PLATFORM_H "SkAtomics_xxx.h" //#define SK_MUTEX_PLATFORM_H "SkMutex_xxx.h" #if defined(_MSC_VER) -# define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_win.h" +# define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h" #else -# define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_sync.h" +# define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h" #endif #if defined(_WIN32) -# define SK_MUTEX_PLATFORM_H "skia/SkMutex_win.h" +# define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_win.h" #else -# define SK_MUTEX_PLATFORM_H "skia/SkMutex_pthread.h" +# define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h" #endif #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) -# define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" +# define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_arm.h" #else -# define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" +# define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_x86.h" #endif // On all platforms we have this byte order diff --git a/gfx/skia/trunk/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h similarity index 100% rename from gfx/skia/trunk/include/core/SkAdvancedTypefaceMetrics.h rename to gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h diff --git a/gfx/skia/trunk/include/core/SkAnnotation.h b/gfx/skia/skia/include/core/SkAnnotation.h similarity index 100% rename from gfx/skia/trunk/include/core/SkAnnotation.h rename to gfx/skia/skia/include/core/SkAnnotation.h diff --git a/gfx/skia/trunk/include/core/SkBBHFactory.h b/gfx/skia/skia/include/core/SkBBHFactory.h similarity index 100% rename from gfx/skia/trunk/include/core/SkBBHFactory.h rename to gfx/skia/skia/include/core/SkBBHFactory.h diff --git a/gfx/skia/trunk/include/core/SkBitmap.h b/gfx/skia/skia/include/core/SkBitmap.h similarity index 100% rename from gfx/skia/trunk/include/core/SkBitmap.h rename to gfx/skia/skia/include/core/SkBitmap.h diff --git a/gfx/skia/trunk/include/core/SkBitmapDevice.h b/gfx/skia/skia/include/core/SkBitmapDevice.h similarity index 100% rename from gfx/skia/trunk/include/core/SkBitmapDevice.h rename to gfx/skia/skia/include/core/SkBitmapDevice.h diff --git a/gfx/skia/trunk/include/core/SkBlitRow.h b/gfx/skia/skia/include/core/SkBlitRow.h similarity index 100% rename from gfx/skia/trunk/include/core/SkBlitRow.h rename to gfx/skia/skia/include/core/SkBlitRow.h diff --git a/gfx/skia/trunk/include/core/SkBlurTypes.h b/gfx/skia/skia/include/core/SkBlurTypes.h similarity index 100% rename from gfx/skia/trunk/include/core/SkBlurTypes.h rename to gfx/skia/skia/include/core/SkBlurTypes.h diff --git a/gfx/skia/trunk/include/core/SkCanvas.h b/gfx/skia/skia/include/core/SkCanvas.h similarity index 100% rename from gfx/skia/trunk/include/core/SkCanvas.h rename to gfx/skia/skia/include/core/SkCanvas.h diff --git a/gfx/skia/trunk/include/core/SkChunkAlloc.h b/gfx/skia/skia/include/core/SkChunkAlloc.h similarity index 100% rename from gfx/skia/trunk/include/core/SkChunkAlloc.h rename to gfx/skia/skia/include/core/SkChunkAlloc.h diff --git a/gfx/skia/trunk/include/core/SkClipStack.h b/gfx/skia/skia/include/core/SkClipStack.h similarity index 100% rename from gfx/skia/trunk/include/core/SkClipStack.h rename to gfx/skia/skia/include/core/SkClipStack.h diff --git a/gfx/skia/trunk/include/core/SkColor.h b/gfx/skia/skia/include/core/SkColor.h similarity index 100% rename from gfx/skia/trunk/include/core/SkColor.h rename to gfx/skia/skia/include/core/SkColor.h diff --git a/gfx/skia/trunk/include/core/SkColorFilter.h b/gfx/skia/skia/include/core/SkColorFilter.h similarity index 100% rename from gfx/skia/trunk/include/core/SkColorFilter.h rename to gfx/skia/skia/include/core/SkColorFilter.h diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h similarity index 100% rename from gfx/skia/trunk/include/core/SkColorPriv.h rename to gfx/skia/skia/include/core/SkColorPriv.h diff --git a/gfx/skia/trunk/include/core/SkColorShader.h b/gfx/skia/skia/include/core/SkColorShader.h similarity index 100% rename from gfx/skia/trunk/include/core/SkColorShader.h rename to gfx/skia/skia/include/core/SkColorShader.h diff --git a/gfx/skia/trunk/include/core/SkColorTable.h b/gfx/skia/skia/include/core/SkColorTable.h similarity index 100% rename from gfx/skia/trunk/include/core/SkColorTable.h rename to gfx/skia/skia/include/core/SkColorTable.h diff --git a/gfx/skia/trunk/include/core/SkComposeShader.h b/gfx/skia/skia/include/core/SkComposeShader.h similarity index 100% rename from gfx/skia/trunk/include/core/SkComposeShader.h rename to gfx/skia/skia/include/core/SkComposeShader.h diff --git a/gfx/skia/trunk/include/core/SkData.h b/gfx/skia/skia/include/core/SkData.h similarity index 100% rename from gfx/skia/trunk/include/core/SkData.h rename to gfx/skia/skia/include/core/SkData.h diff --git a/gfx/skia/trunk/include/core/SkDataTable.h b/gfx/skia/skia/include/core/SkDataTable.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDataTable.h rename to gfx/skia/skia/include/core/SkDataTable.h diff --git a/gfx/skia/trunk/include/core/SkDeque.h b/gfx/skia/skia/include/core/SkDeque.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDeque.h rename to gfx/skia/skia/include/core/SkDeque.h diff --git a/gfx/skia/trunk/include/core/SkDevice.h b/gfx/skia/skia/include/core/SkDevice.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDevice.h rename to gfx/skia/skia/include/core/SkDevice.h diff --git a/gfx/skia/trunk/include/core/SkDeviceProperties.h b/gfx/skia/skia/include/core/SkDeviceProperties.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDeviceProperties.h rename to gfx/skia/skia/include/core/SkDeviceProperties.h diff --git a/gfx/skia/trunk/include/core/SkDither.h b/gfx/skia/skia/include/core/SkDither.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDither.h rename to gfx/skia/skia/include/core/SkDither.h diff --git a/gfx/skia/trunk/include/core/SkDocument.h b/gfx/skia/skia/include/core/SkDocument.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDocument.h rename to gfx/skia/skia/include/core/SkDocument.h diff --git a/gfx/skia/trunk/include/core/SkDraw.h b/gfx/skia/skia/include/core/SkDraw.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDraw.h rename to gfx/skia/skia/include/core/SkDraw.h diff --git a/gfx/skia/trunk/include/core/SkDrawFilter.h b/gfx/skia/skia/include/core/SkDrawFilter.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDrawFilter.h rename to gfx/skia/skia/include/core/SkDrawFilter.h diff --git a/gfx/skia/trunk/include/core/SkDrawLooper.h b/gfx/skia/skia/include/core/SkDrawLooper.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDrawLooper.h rename to gfx/skia/skia/include/core/SkDrawLooper.h diff --git a/gfx/skia/trunk/include/core/SkDrawPictureCallback.h b/gfx/skia/skia/include/core/SkDrawPictureCallback.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDrawPictureCallback.h rename to gfx/skia/skia/include/core/SkDrawPictureCallback.h diff --git a/gfx/skia/trunk/include/core/SkDynamicAnnotations.h b/gfx/skia/skia/include/core/SkDynamicAnnotations.h similarity index 100% rename from gfx/skia/trunk/include/core/SkDynamicAnnotations.h rename to gfx/skia/skia/include/core/SkDynamicAnnotations.h diff --git a/gfx/skia/trunk/include/core/SkEndian.h b/gfx/skia/skia/include/core/SkEndian.h similarity index 100% rename from gfx/skia/trunk/include/core/SkEndian.h rename to gfx/skia/skia/include/core/SkEndian.h diff --git a/gfx/skia/trunk/include/core/SkError.h b/gfx/skia/skia/include/core/SkError.h similarity index 100% rename from gfx/skia/trunk/include/core/SkError.h rename to gfx/skia/skia/include/core/SkError.h diff --git a/gfx/skia/trunk/include/core/SkFixed.h b/gfx/skia/skia/include/core/SkFixed.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFixed.h rename to gfx/skia/skia/include/core/SkFixed.h diff --git a/gfx/skia/trunk/include/core/SkFlattenable.h b/gfx/skia/skia/include/core/SkFlattenable.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFlattenable.h rename to gfx/skia/skia/include/core/SkFlattenable.h diff --git a/gfx/skia/trunk/include/core/SkFlattenableBuffers.h b/gfx/skia/skia/include/core/SkFlattenableBuffers.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFlattenableBuffers.h rename to gfx/skia/skia/include/core/SkFlattenableBuffers.h diff --git a/gfx/skia/trunk/include/core/SkFlattenableSerialization.h b/gfx/skia/skia/include/core/SkFlattenableSerialization.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFlattenableSerialization.h rename to gfx/skia/skia/include/core/SkFlattenableSerialization.h diff --git a/gfx/skia/trunk/include/core/SkFloatBits.h b/gfx/skia/skia/include/core/SkFloatBits.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFloatBits.h rename to gfx/skia/skia/include/core/SkFloatBits.h diff --git a/gfx/skia/trunk/include/core/SkFloatingPoint.h b/gfx/skia/skia/include/core/SkFloatingPoint.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFloatingPoint.h rename to gfx/skia/skia/include/core/SkFloatingPoint.h diff --git a/gfx/skia/trunk/include/core/SkFont.h b/gfx/skia/skia/include/core/SkFont.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFont.h rename to gfx/skia/skia/include/core/SkFont.h diff --git a/gfx/skia/trunk/include/core/SkFontHost.h b/gfx/skia/skia/include/core/SkFontHost.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFontHost.h rename to gfx/skia/skia/include/core/SkFontHost.h diff --git a/gfx/skia/trunk/include/core/SkFontLCDConfig.h b/gfx/skia/skia/include/core/SkFontLCDConfig.h similarity index 100% rename from gfx/skia/trunk/include/core/SkFontLCDConfig.h rename to gfx/skia/skia/include/core/SkFontLCDConfig.h diff --git a/gfx/skia/trunk/include/core/SkGraphics.h b/gfx/skia/skia/include/core/SkGraphics.h similarity index 100% rename from gfx/skia/trunk/include/core/SkGraphics.h rename to gfx/skia/skia/include/core/SkGraphics.h diff --git a/gfx/skia/trunk/include/core/SkImage.h b/gfx/skia/skia/include/core/SkImage.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImage.h rename to gfx/skia/skia/include/core/SkImage.h diff --git a/gfx/skia/trunk/include/core/SkImageDecoder.h b/gfx/skia/skia/include/core/SkImageDecoder.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImageDecoder.h rename to gfx/skia/skia/include/core/SkImageDecoder.h diff --git a/gfx/skia/trunk/include/core/SkImageEncoder.h b/gfx/skia/skia/include/core/SkImageEncoder.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImageEncoder.h rename to gfx/skia/skia/include/core/SkImageEncoder.h diff --git a/gfx/skia/trunk/include/core/SkImageFilter.h b/gfx/skia/skia/include/core/SkImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImageFilter.h rename to gfx/skia/skia/include/core/SkImageFilter.h diff --git a/gfx/skia/trunk/include/core/SkImageGenerator.h b/gfx/skia/skia/include/core/SkImageGenerator.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImageGenerator.h rename to gfx/skia/skia/include/core/SkImageGenerator.h diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/skia/include/core/SkImageInfo.h similarity index 100% rename from gfx/skia/trunk/include/core/SkImageInfo.h rename to gfx/skia/skia/include/core/SkImageInfo.h diff --git a/gfx/skia/trunk/include/core/SkInstCnt.h b/gfx/skia/skia/include/core/SkInstCnt.h similarity index 100% rename from gfx/skia/trunk/include/core/SkInstCnt.h rename to gfx/skia/skia/include/core/SkInstCnt.h diff --git a/gfx/skia/trunk/include/core/SkMallocPixelRef.h b/gfx/skia/skia/include/core/SkMallocPixelRef.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMallocPixelRef.h rename to gfx/skia/skia/include/core/SkMallocPixelRef.h diff --git a/gfx/skia/trunk/include/core/SkMask.h b/gfx/skia/skia/include/core/SkMask.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMask.h rename to gfx/skia/skia/include/core/SkMask.h diff --git a/gfx/skia/trunk/include/core/SkMaskFilter.h b/gfx/skia/skia/include/core/SkMaskFilter.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMaskFilter.h rename to gfx/skia/skia/include/core/SkMaskFilter.h diff --git a/gfx/skia/trunk/include/core/SkMath.h b/gfx/skia/skia/include/core/SkMath.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMath.h rename to gfx/skia/skia/include/core/SkMath.h diff --git a/gfx/skia/trunk/include/core/SkMatrix.h b/gfx/skia/skia/include/core/SkMatrix.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMatrix.h rename to gfx/skia/skia/include/core/SkMatrix.h diff --git a/gfx/skia/trunk/include/core/SkMetaData.h b/gfx/skia/skia/include/core/SkMetaData.h similarity index 100% rename from gfx/skia/trunk/include/core/SkMetaData.h rename to gfx/skia/skia/include/core/SkMetaData.h diff --git a/gfx/skia/trunk/include/core/SkOSFile.h b/gfx/skia/skia/include/core/SkOSFile.h similarity index 100% rename from gfx/skia/trunk/include/core/SkOSFile.h rename to gfx/skia/skia/include/core/SkOSFile.h diff --git a/gfx/skia/trunk/include/core/SkOnce.h b/gfx/skia/skia/include/core/SkOnce.h similarity index 100% rename from gfx/skia/trunk/include/core/SkOnce.h rename to gfx/skia/skia/include/core/SkOnce.h diff --git a/gfx/skia/trunk/include/core/SkPackBits.h b/gfx/skia/skia/include/core/SkPackBits.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPackBits.h rename to gfx/skia/skia/include/core/SkPackBits.h diff --git a/gfx/skia/trunk/include/core/SkPaint.h b/gfx/skia/skia/include/core/SkPaint.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPaint.h rename to gfx/skia/skia/include/core/SkPaint.h diff --git a/gfx/skia/trunk/include/core/SkPaintOptionsAndroid.h b/gfx/skia/skia/include/core/SkPaintOptionsAndroid.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPaintOptionsAndroid.h rename to gfx/skia/skia/include/core/SkPaintOptionsAndroid.h diff --git a/gfx/skia/trunk/include/core/SkPatch.h b/gfx/skia/skia/include/core/SkPatch.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPatch.h rename to gfx/skia/skia/include/core/SkPatch.h diff --git a/gfx/skia/trunk/include/core/SkPath.h b/gfx/skia/skia/include/core/SkPath.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPath.h rename to gfx/skia/skia/include/core/SkPath.h diff --git a/gfx/skia/trunk/include/core/SkPathEffect.h b/gfx/skia/skia/include/core/SkPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPathEffect.h rename to gfx/skia/skia/include/core/SkPathEffect.h diff --git a/gfx/skia/trunk/include/core/SkPathMeasure.h b/gfx/skia/skia/include/core/SkPathMeasure.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPathMeasure.h rename to gfx/skia/skia/include/core/SkPathMeasure.h diff --git a/gfx/skia/trunk/include/core/SkPathRef.h b/gfx/skia/skia/include/core/SkPathRef.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPathRef.h rename to gfx/skia/skia/include/core/SkPathRef.h diff --git a/gfx/skia/trunk/include/core/SkPicture.h b/gfx/skia/skia/include/core/SkPicture.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPicture.h rename to gfx/skia/skia/include/core/SkPicture.h diff --git a/gfx/skia/trunk/include/core/SkPictureRecorder.h b/gfx/skia/skia/include/core/SkPictureRecorder.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPictureRecorder.h rename to gfx/skia/skia/include/core/SkPictureRecorder.h diff --git a/gfx/skia/trunk/include/core/SkPixelRef.h b/gfx/skia/skia/include/core/SkPixelRef.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPixelRef.h rename to gfx/skia/skia/include/core/SkPixelRef.h diff --git a/gfx/skia/trunk/include/core/SkPoint.h b/gfx/skia/skia/include/core/SkPoint.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPoint.h rename to gfx/skia/skia/include/core/SkPoint.h diff --git a/gfx/skia/trunk/include/core/SkPostConfig.h b/gfx/skia/skia/include/core/SkPostConfig.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPostConfig.h rename to gfx/skia/skia/include/core/SkPostConfig.h diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h similarity index 100% rename from gfx/skia/trunk/include/core/SkPreConfig.h rename to gfx/skia/skia/include/core/SkPreConfig.h diff --git a/gfx/skia/trunk/include/core/SkRRect.h b/gfx/skia/skia/include/core/SkRRect.h similarity index 100% rename from gfx/skia/trunk/include/core/SkRRect.h rename to gfx/skia/skia/include/core/SkRRect.h diff --git a/gfx/skia/trunk/include/core/SkRasterizer.h b/gfx/skia/skia/include/core/SkRasterizer.h similarity index 100% rename from gfx/skia/trunk/include/core/SkRasterizer.h rename to gfx/skia/skia/include/core/SkRasterizer.h diff --git a/gfx/skia/trunk/include/core/SkReadBuffer.h b/gfx/skia/skia/include/core/SkReadBuffer.h similarity index 100% rename from gfx/skia/trunk/include/core/SkReadBuffer.h rename to gfx/skia/skia/include/core/SkReadBuffer.h diff --git a/gfx/skia/trunk/include/core/SkReader32.h b/gfx/skia/skia/include/core/SkReader32.h similarity index 100% rename from gfx/skia/trunk/include/core/SkReader32.h rename to gfx/skia/skia/include/core/SkReader32.h diff --git a/gfx/skia/trunk/include/core/SkRect.h b/gfx/skia/skia/include/core/SkRect.h similarity index 100% rename from gfx/skia/trunk/include/core/SkRect.h rename to gfx/skia/skia/include/core/SkRect.h diff --git a/gfx/skia/trunk/include/core/SkRefCnt.h b/gfx/skia/skia/include/core/SkRefCnt.h similarity index 100% rename from gfx/skia/trunk/include/core/SkRefCnt.h rename to gfx/skia/skia/include/core/SkRefCnt.h diff --git a/gfx/skia/trunk/include/core/SkRegion.h b/gfx/skia/skia/include/core/SkRegion.h similarity index 100% rename from gfx/skia/trunk/include/core/SkRegion.h rename to gfx/skia/skia/include/core/SkRegion.h diff --git a/gfx/skia/trunk/include/core/SkScalar.h b/gfx/skia/skia/include/core/SkScalar.h similarity index 100% rename from gfx/skia/trunk/include/core/SkScalar.h rename to gfx/skia/skia/include/core/SkScalar.h diff --git a/gfx/skia/trunk/include/core/SkShader.h b/gfx/skia/skia/include/core/SkShader.h similarity index 99% rename from gfx/skia/trunk/include/core/SkShader.h rename to gfx/skia/skia/include/core/SkShader.h index db40882b89..e5af40dd7a 100644 --- a/gfx/skia/trunk/include/core/SkShader.h +++ b/gfx/skia/skia/include/core/SkShader.h @@ -14,7 +14,7 @@ #include "SkMask.h" #include "SkMatrix.h" #include "SkPaint.h" -#include "GrColor.h" +#include "../gpu/GrColor.h" class SkPath; class SkPicture; diff --git a/gfx/skia/trunk/include/core/SkSize.h b/gfx/skia/skia/include/core/SkSize.h similarity index 100% rename from gfx/skia/trunk/include/core/SkSize.h rename to gfx/skia/skia/include/core/SkSize.h diff --git a/gfx/skia/trunk/include/core/SkStream.h b/gfx/skia/skia/include/core/SkStream.h similarity index 100% rename from gfx/skia/trunk/include/core/SkStream.h rename to gfx/skia/skia/include/core/SkStream.h diff --git a/gfx/skia/trunk/include/core/SkString.h b/gfx/skia/skia/include/core/SkString.h similarity index 100% rename from gfx/skia/trunk/include/core/SkString.h rename to gfx/skia/skia/include/core/SkString.h diff --git a/gfx/skia/trunk/include/core/SkStrokeRec.h b/gfx/skia/skia/include/core/SkStrokeRec.h similarity index 100% rename from gfx/skia/trunk/include/core/SkStrokeRec.h rename to gfx/skia/skia/include/core/SkStrokeRec.h diff --git a/gfx/skia/trunk/include/core/SkSurface.h b/gfx/skia/skia/include/core/SkSurface.h similarity index 100% rename from gfx/skia/trunk/include/core/SkSurface.h rename to gfx/skia/skia/include/core/SkSurface.h diff --git a/gfx/skia/trunk/include/core/SkTArray.h b/gfx/skia/skia/include/core/SkTArray.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTArray.h rename to gfx/skia/skia/include/core/SkTArray.h diff --git a/gfx/skia/trunk/include/core/SkTDArray.h b/gfx/skia/skia/include/core/SkTDArray.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTDArray.h rename to gfx/skia/skia/include/core/SkTDArray.h diff --git a/gfx/skia/trunk/include/core/SkTDStack.h b/gfx/skia/skia/include/core/SkTDStack.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTDStack.h rename to gfx/skia/skia/include/core/SkTDStack.h diff --git a/gfx/skia/trunk/include/core/SkTDict.h b/gfx/skia/skia/include/core/SkTDict.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTDict.h rename to gfx/skia/skia/include/core/SkTDict.h diff --git a/gfx/skia/trunk/include/core/SkTInternalLList.h b/gfx/skia/skia/include/core/SkTInternalLList.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTInternalLList.h rename to gfx/skia/skia/include/core/SkTInternalLList.h diff --git a/gfx/skia/trunk/include/core/SkTLazy.h b/gfx/skia/skia/include/core/SkTLazy.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTLazy.h rename to gfx/skia/skia/include/core/SkTLazy.h diff --git a/gfx/skia/trunk/include/core/SkTRegistry.h b/gfx/skia/skia/include/core/SkTRegistry.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTRegistry.h rename to gfx/skia/skia/include/core/SkTRegistry.h diff --git a/gfx/skia/trunk/include/core/SkTSearch.h b/gfx/skia/skia/include/core/SkTSearch.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTSearch.h rename to gfx/skia/skia/include/core/SkTSearch.h diff --git a/gfx/skia/trunk/include/core/SkTemplates.h b/gfx/skia/skia/include/core/SkTemplates.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTemplates.h rename to gfx/skia/skia/include/core/SkTemplates.h diff --git a/gfx/skia/trunk/include/core/SkThread.h b/gfx/skia/skia/include/core/SkThread.h similarity index 100% rename from gfx/skia/trunk/include/core/SkThread.h rename to gfx/skia/skia/include/core/SkThread.h diff --git a/gfx/skia/trunk/include/core/SkTime.h b/gfx/skia/skia/include/core/SkTime.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTime.h rename to gfx/skia/skia/include/core/SkTime.h diff --git a/gfx/skia/trunk/include/core/SkTypeface.h b/gfx/skia/skia/include/core/SkTypeface.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTypeface.h rename to gfx/skia/skia/include/core/SkTypeface.h diff --git a/gfx/skia/trunk/include/core/SkTypes.h b/gfx/skia/skia/include/core/SkTypes.h similarity index 100% rename from gfx/skia/trunk/include/core/SkTypes.h rename to gfx/skia/skia/include/core/SkTypes.h diff --git a/gfx/skia/trunk/include/core/SkUnPreMultiply.h b/gfx/skia/skia/include/core/SkUnPreMultiply.h similarity index 100% rename from gfx/skia/trunk/include/core/SkUnPreMultiply.h rename to gfx/skia/skia/include/core/SkUnPreMultiply.h diff --git a/gfx/skia/trunk/include/core/SkUtils.h b/gfx/skia/skia/include/core/SkUtils.h similarity index 100% rename from gfx/skia/trunk/include/core/SkUtils.h rename to gfx/skia/skia/include/core/SkUtils.h diff --git a/gfx/skia/trunk/include/core/SkWeakRefCnt.h b/gfx/skia/skia/include/core/SkWeakRefCnt.h similarity index 100% rename from gfx/skia/trunk/include/core/SkWeakRefCnt.h rename to gfx/skia/skia/include/core/SkWeakRefCnt.h diff --git a/gfx/skia/trunk/include/core/SkWriteBuffer.h b/gfx/skia/skia/include/core/SkWriteBuffer.h similarity index 100% rename from gfx/skia/trunk/include/core/SkWriteBuffer.h rename to gfx/skia/skia/include/core/SkWriteBuffer.h diff --git a/gfx/skia/trunk/include/core/SkWriter32.h b/gfx/skia/skia/include/core/SkWriter32.h similarity index 100% rename from gfx/skia/trunk/include/core/SkWriter32.h rename to gfx/skia/skia/include/core/SkWriter32.h diff --git a/gfx/skia/trunk/include/core/SkXfermode.h b/gfx/skia/skia/include/core/SkXfermode.h similarity index 100% rename from gfx/skia/trunk/include/core/SkXfermode.h rename to gfx/skia/skia/include/core/SkXfermode.h diff --git a/gfx/skia/trunk/include/device/xps/SkConstexprMath.h b/gfx/skia/skia/include/device/xps/SkConstexprMath.h similarity index 100% rename from gfx/skia/trunk/include/device/xps/SkConstexprMath.h rename to gfx/skia/skia/include/device/xps/SkConstexprMath.h diff --git a/gfx/skia/trunk/include/device/xps/SkXPSDevice.h b/gfx/skia/skia/include/device/xps/SkXPSDevice.h similarity index 100% rename from gfx/skia/trunk/include/device/xps/SkXPSDevice.h rename to gfx/skia/skia/include/device/xps/SkXPSDevice.h diff --git a/gfx/skia/trunk/include/effects/Sk1DPathEffect.h b/gfx/skia/skia/include/effects/Sk1DPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/Sk1DPathEffect.h rename to gfx/skia/skia/include/effects/Sk1DPathEffect.h diff --git a/gfx/skia/trunk/include/effects/Sk2DPathEffect.h b/gfx/skia/skia/include/effects/Sk2DPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/Sk2DPathEffect.h rename to gfx/skia/skia/include/effects/Sk2DPathEffect.h diff --git a/gfx/skia/trunk/include/effects/SkAlphaThresholdFilter.h b/gfx/skia/skia/include/effects/SkAlphaThresholdFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkAlphaThresholdFilter.h rename to gfx/skia/skia/include/effects/SkAlphaThresholdFilter.h diff --git a/gfx/skia/trunk/include/effects/SkArithmeticMode.h b/gfx/skia/skia/include/effects/SkArithmeticMode.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkArithmeticMode.h rename to gfx/skia/skia/include/effects/SkArithmeticMode.h diff --git a/gfx/skia/trunk/include/effects/SkAvoidXfermode.h b/gfx/skia/skia/include/effects/SkAvoidXfermode.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkAvoidXfermode.h rename to gfx/skia/skia/include/effects/SkAvoidXfermode.h diff --git a/gfx/skia/trunk/include/effects/SkBitmapSource.h b/gfx/skia/skia/include/effects/SkBitmapSource.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkBitmapSource.h rename to gfx/skia/skia/include/effects/SkBitmapSource.h diff --git a/gfx/skia/trunk/include/effects/SkBlurDrawLooper.h b/gfx/skia/skia/include/effects/SkBlurDrawLooper.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkBlurDrawLooper.h rename to gfx/skia/skia/include/effects/SkBlurDrawLooper.h diff --git a/gfx/skia/trunk/include/effects/SkBlurImageFilter.h b/gfx/skia/skia/include/effects/SkBlurImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkBlurImageFilter.h rename to gfx/skia/skia/include/effects/SkBlurImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkBlurMaskFilter.h b/gfx/skia/skia/include/effects/SkBlurMaskFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkBlurMaskFilter.h rename to gfx/skia/skia/include/effects/SkBlurMaskFilter.h diff --git a/gfx/skia/trunk/include/effects/SkColorFilterImageFilter.h b/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkColorFilterImageFilter.h rename to gfx/skia/skia/include/effects/SkColorFilterImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkColorMatrix.h b/gfx/skia/skia/include/effects/SkColorMatrix.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkColorMatrix.h rename to gfx/skia/skia/include/effects/SkColorMatrix.h diff --git a/gfx/skia/trunk/include/effects/SkColorMatrixFilter.h b/gfx/skia/skia/include/effects/SkColorMatrixFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkColorMatrixFilter.h rename to gfx/skia/skia/include/effects/SkColorMatrixFilter.h diff --git a/gfx/skia/trunk/include/effects/SkComposeImageFilter.h b/gfx/skia/skia/include/effects/SkComposeImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkComposeImageFilter.h rename to gfx/skia/skia/include/effects/SkComposeImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkCornerPathEffect.h b/gfx/skia/skia/include/effects/SkCornerPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkCornerPathEffect.h rename to gfx/skia/skia/include/effects/SkCornerPathEffect.h diff --git a/gfx/skia/trunk/include/effects/SkDashPathEffect.h b/gfx/skia/skia/include/effects/SkDashPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkDashPathEffect.h rename to gfx/skia/skia/include/effects/SkDashPathEffect.h diff --git a/gfx/skia/trunk/include/effects/SkDiscretePathEffect.h b/gfx/skia/skia/include/effects/SkDiscretePathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkDiscretePathEffect.h rename to gfx/skia/skia/include/effects/SkDiscretePathEffect.h diff --git a/gfx/skia/trunk/include/effects/SkDisplacementMapEffect.h b/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkDisplacementMapEffect.h rename to gfx/skia/skia/include/effects/SkDisplacementMapEffect.h diff --git a/gfx/skia/trunk/include/effects/SkDrawExtraPathEffect.h b/gfx/skia/skia/include/effects/SkDrawExtraPathEffect.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkDrawExtraPathEffect.h rename to gfx/skia/skia/include/effects/SkDrawExtraPathEffect.h diff --git a/gfx/skia/trunk/include/effects/SkDropShadowImageFilter.h b/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkDropShadowImageFilter.h rename to gfx/skia/skia/include/effects/SkDropShadowImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkEmbossMaskFilter.h b/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkEmbossMaskFilter.h rename to gfx/skia/skia/include/effects/SkEmbossMaskFilter.h diff --git a/gfx/skia/trunk/include/effects/SkGradientShader.h b/gfx/skia/skia/include/effects/SkGradientShader.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkGradientShader.h rename to gfx/skia/skia/include/effects/SkGradientShader.h diff --git a/gfx/skia/trunk/include/effects/SkLayerDrawLooper.h b/gfx/skia/skia/include/effects/SkLayerDrawLooper.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkLayerDrawLooper.h rename to gfx/skia/skia/include/effects/SkLayerDrawLooper.h diff --git a/gfx/skia/trunk/include/effects/SkLayerRasterizer.h b/gfx/skia/skia/include/effects/SkLayerRasterizer.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkLayerRasterizer.h rename to gfx/skia/skia/include/effects/SkLayerRasterizer.h diff --git a/gfx/skia/trunk/include/effects/SkLerpXfermode.h b/gfx/skia/skia/include/effects/SkLerpXfermode.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkLerpXfermode.h rename to gfx/skia/skia/include/effects/SkLerpXfermode.h diff --git a/gfx/skia/trunk/include/effects/SkLightingImageFilter.h b/gfx/skia/skia/include/effects/SkLightingImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkLightingImageFilter.h rename to gfx/skia/skia/include/effects/SkLightingImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkLumaColorFilter.h b/gfx/skia/skia/include/effects/SkLumaColorFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkLumaColorFilter.h rename to gfx/skia/skia/include/effects/SkLumaColorFilter.h diff --git a/gfx/skia/trunk/include/effects/SkMagnifierImageFilter.h b/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkMagnifierImageFilter.h rename to gfx/skia/skia/include/effects/SkMagnifierImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkMatrixConvolutionImageFilter.h b/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkMatrixConvolutionImageFilter.h rename to gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkMatrixImageFilter.h b/gfx/skia/skia/include/effects/SkMatrixImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkMatrixImageFilter.h rename to gfx/skia/skia/include/effects/SkMatrixImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkMergeImageFilter.h b/gfx/skia/skia/include/effects/SkMergeImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkMergeImageFilter.h rename to gfx/skia/skia/include/effects/SkMergeImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkMorphologyImageFilter.h b/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkMorphologyImageFilter.h rename to gfx/skia/skia/include/effects/SkMorphologyImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkOffsetImageFilter.h b/gfx/skia/skia/include/effects/SkOffsetImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkOffsetImageFilter.h rename to gfx/skia/skia/include/effects/SkOffsetImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkPaintFlagsDrawFilter.h b/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkPaintFlagsDrawFilter.h rename to gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h diff --git a/gfx/skia/trunk/include/effects/SkPerlinNoiseShader.h b/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkPerlinNoiseShader.h rename to gfx/skia/skia/include/effects/SkPerlinNoiseShader.h diff --git a/gfx/skia/trunk/include/effects/SkPictureImageFilter.h b/gfx/skia/skia/include/effects/SkPictureImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkPictureImageFilter.h rename to gfx/skia/skia/include/effects/SkPictureImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkPixelXorXfermode.h b/gfx/skia/skia/include/effects/SkPixelXorXfermode.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkPixelXorXfermode.h rename to gfx/skia/skia/include/effects/SkPixelXorXfermode.h diff --git a/gfx/skia/trunk/include/effects/SkPorterDuff.h b/gfx/skia/skia/include/effects/SkPorterDuff.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkPorterDuff.h rename to gfx/skia/skia/include/effects/SkPorterDuff.h diff --git a/gfx/skia/trunk/include/effects/SkRectShaderImageFilter.h b/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkRectShaderImageFilter.h rename to gfx/skia/skia/include/effects/SkRectShaderImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkStippleMaskFilter.h b/gfx/skia/skia/include/effects/SkStippleMaskFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkStippleMaskFilter.h rename to gfx/skia/skia/include/effects/SkStippleMaskFilter.h diff --git a/gfx/skia/trunk/include/effects/SkTableColorFilter.h b/gfx/skia/skia/include/effects/SkTableColorFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkTableColorFilter.h rename to gfx/skia/skia/include/effects/SkTableColorFilter.h diff --git a/gfx/skia/trunk/include/effects/SkTableMaskFilter.h b/gfx/skia/skia/include/effects/SkTableMaskFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkTableMaskFilter.h rename to gfx/skia/skia/include/effects/SkTableMaskFilter.h diff --git a/gfx/skia/trunk/include/effects/SkTestImageFilters.h b/gfx/skia/skia/include/effects/SkTestImageFilters.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkTestImageFilters.h rename to gfx/skia/skia/include/effects/SkTestImageFilters.h diff --git a/gfx/skia/trunk/include/effects/SkTileImageFilter.h b/gfx/skia/skia/include/effects/SkTileImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkTileImageFilter.h rename to gfx/skia/skia/include/effects/SkTileImageFilter.h diff --git a/gfx/skia/trunk/include/effects/SkTransparentShader.h b/gfx/skia/skia/include/effects/SkTransparentShader.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkTransparentShader.h rename to gfx/skia/skia/include/effects/SkTransparentShader.h diff --git a/gfx/skia/trunk/include/effects/SkXfermodeImageFilter.h b/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h similarity index 100% rename from gfx/skia/trunk/include/effects/SkXfermodeImageFilter.h rename to gfx/skia/skia/include/effects/SkXfermodeImageFilter.h diff --git a/gfx/skia/trunk/include/gpu/GrBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrBackendEffectFactory.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrBackendEffectFactory.h rename to gfx/skia/skia/include/gpu/GrBackendEffectFactory.h diff --git a/gfx/skia/trunk/include/gpu/GrClipData.h b/gfx/skia/skia/include/gpu/GrClipData.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrClipData.h rename to gfx/skia/skia/include/gpu/GrClipData.h diff --git a/gfx/skia/trunk/include/gpu/GrColor.h b/gfx/skia/skia/include/gpu/GrColor.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrColor.h rename to gfx/skia/skia/include/gpu/GrColor.h diff --git a/gfx/skia/trunk/include/gpu/GrConfig.h b/gfx/skia/skia/include/gpu/GrConfig.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrConfig.h rename to gfx/skia/skia/include/gpu/GrConfig.h diff --git a/gfx/skia/trunk/include/gpu/GrContext.h b/gfx/skia/skia/include/gpu/GrContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrContext.h rename to gfx/skia/skia/include/gpu/GrContext.h diff --git a/gfx/skia/trunk/include/gpu/GrContextFactory.h b/gfx/skia/skia/include/gpu/GrContextFactory.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrContextFactory.h rename to gfx/skia/skia/include/gpu/GrContextFactory.h diff --git a/gfx/skia/trunk/include/gpu/GrCoordTransform.h b/gfx/skia/skia/include/gpu/GrCoordTransform.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrCoordTransform.h rename to gfx/skia/skia/include/gpu/GrCoordTransform.h diff --git a/gfx/skia/trunk/include/gpu/GrDrawEffect.h b/gfx/skia/skia/include/gpu/GrDrawEffect.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrDrawEffect.h rename to gfx/skia/skia/include/gpu/GrDrawEffect.h diff --git a/gfx/skia/trunk/include/gpu/GrEffect.h b/gfx/skia/skia/include/gpu/GrEffect.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrEffect.h rename to gfx/skia/skia/include/gpu/GrEffect.h diff --git a/gfx/skia/trunk/include/gpu/GrEffectStage.h b/gfx/skia/skia/include/gpu/GrEffectStage.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrEffectStage.h rename to gfx/skia/skia/include/gpu/GrEffectStage.h diff --git a/gfx/skia/trunk/include/gpu/GrEffectUnitTest.h b/gfx/skia/skia/include/gpu/GrEffectUnitTest.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrEffectUnitTest.h rename to gfx/skia/skia/include/gpu/GrEffectUnitTest.h diff --git a/gfx/skia/trunk/include/gpu/GrFontScaler.h b/gfx/skia/skia/include/gpu/GrFontScaler.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrFontScaler.h rename to gfx/skia/skia/include/gpu/GrFontScaler.h diff --git a/gfx/skia/trunk/include/gpu/GrGlyph.h b/gfx/skia/skia/include/gpu/GrGlyph.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrGlyph.h rename to gfx/skia/skia/include/gpu/GrGlyph.h diff --git a/gfx/skia/trunk/include/gpu/GrGpuResource.h b/gfx/skia/skia/include/gpu/GrGpuResource.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrGpuResource.h rename to gfx/skia/skia/include/gpu/GrGpuResource.h diff --git a/gfx/skia/trunk/include/gpu/GrPaint.h b/gfx/skia/skia/include/gpu/GrPaint.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrPaint.h rename to gfx/skia/skia/include/gpu/GrPaint.h diff --git a/gfx/skia/trunk/include/gpu/GrPathRendererChain.h b/gfx/skia/skia/include/gpu/GrPathRendererChain.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrPathRendererChain.h rename to gfx/skia/skia/include/gpu/GrPathRendererChain.h diff --git a/gfx/skia/trunk/include/gpu/GrRect.h b/gfx/skia/skia/include/gpu/GrRect.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrRect.h rename to gfx/skia/skia/include/gpu/GrRect.h diff --git a/gfx/skia/trunk/include/gpu/GrRenderTarget.h b/gfx/skia/skia/include/gpu/GrRenderTarget.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrRenderTarget.h rename to gfx/skia/skia/include/gpu/GrRenderTarget.h diff --git a/gfx/skia/trunk/include/gpu/GrSurface.h b/gfx/skia/skia/include/gpu/GrSurface.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrSurface.h rename to gfx/skia/skia/include/gpu/GrSurface.h diff --git a/gfx/skia/trunk/include/gpu/GrTBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrTBackendEffectFactory.h rename to gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h diff --git a/gfx/skia/trunk/include/gpu/GrTexture.h b/gfx/skia/skia/include/gpu/GrTexture.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrTexture.h rename to gfx/skia/skia/include/gpu/GrTexture.h diff --git a/gfx/skia/trunk/include/gpu/GrTextureAccess.h b/gfx/skia/skia/include/gpu/GrTextureAccess.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrTextureAccess.h rename to gfx/skia/skia/include/gpu/GrTextureAccess.h diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/skia/include/gpu/GrTypes.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrTypes.h rename to gfx/skia/skia/include/gpu/GrTypes.h diff --git a/gfx/skia/trunk/include/gpu/GrTypesPriv.h b/gfx/skia/skia/include/gpu/GrTypesPriv.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrTypesPriv.h rename to gfx/skia/skia/include/gpu/GrTypesPriv.h diff --git a/gfx/skia/trunk/include/gpu/GrUserConfig.h b/gfx/skia/skia/include/gpu/GrUserConfig.h similarity index 100% rename from gfx/skia/trunk/include/gpu/GrUserConfig.h rename to gfx/skia/skia/include/gpu/GrUserConfig.h diff --git a/gfx/skia/trunk/include/gpu/SkGpuDevice.h b/gfx/skia/skia/include/gpu/SkGpuDevice.h similarity index 100% rename from gfx/skia/trunk/include/gpu/SkGpuDevice.h rename to gfx/skia/skia/include/gpu/SkGpuDevice.h diff --git a/gfx/skia/trunk/include/gpu/SkGr.h b/gfx/skia/skia/include/gpu/SkGr.h similarity index 100% rename from gfx/skia/trunk/include/gpu/SkGr.h rename to gfx/skia/skia/include/gpu/SkGr.h diff --git a/gfx/skia/trunk/include/gpu/SkGrPixelRef.h b/gfx/skia/skia/include/gpu/SkGrPixelRef.h similarity index 100% rename from gfx/skia/trunk/include/gpu/SkGrPixelRef.h rename to gfx/skia/skia/include/gpu/SkGrPixelRef.h diff --git a/gfx/skia/trunk/include/gpu/SkGrTexturePixelRef.h b/gfx/skia/skia/include/gpu/SkGrTexturePixelRef.h similarity index 100% rename from gfx/skia/trunk/include/gpu/SkGrTexturePixelRef.h rename to gfx/skia/skia/include/gpu/SkGrTexturePixelRef.h diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLConfig.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/GrGLConfig.h rename to gfx/skia/skia/include/gpu/gl/GrGLConfig.h diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLConfig_chrome.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/GrGLConfig_chrome.h rename to gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLExtensions.h b/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/GrGLExtensions.h rename to gfx/skia/skia/include/gpu/gl/GrGLExtensions.h diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLFunctions.h b/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/GrGLFunctions.h rename to gfx/skia/skia/include/gpu/gl/GrGLFunctions.h diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLInterface.h b/gfx/skia/skia/include/gpu/gl/GrGLInterface.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/GrGLInterface.h rename to gfx/skia/skia/include/gpu/gl/GrGLInterface.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkANGLEGLContext.h b/gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkANGLEGLContext.h rename to gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkDebugGLContext.h b/gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkDebugGLContext.h rename to gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkGLContextHelper.h b/gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkGLContextHelper.h rename to gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkMesaGLContext.h b/gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkMesaGLContext.h rename to gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkNativeGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkNativeGLContext.h rename to gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h diff --git a/gfx/skia/trunk/include/gpu/gl/SkNullGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h similarity index 100% rename from gfx/skia/trunk/include/gpu/gl/SkNullGLContext.h rename to gfx/skia/skia/include/gpu/gl/SkNullGLContext.h diff --git a/gfx/skia/trunk/include/images/SkDecodingImageGenerator.h b/gfx/skia/skia/include/images/SkDecodingImageGenerator.h similarity index 100% rename from gfx/skia/trunk/include/images/SkDecodingImageGenerator.h rename to gfx/skia/skia/include/images/SkDecodingImageGenerator.h diff --git a/gfx/skia/trunk/include/images/SkForceLinking.h b/gfx/skia/skia/include/images/SkForceLinking.h similarity index 100% rename from gfx/skia/trunk/include/images/SkForceLinking.h rename to gfx/skia/skia/include/images/SkForceLinking.h diff --git a/gfx/skia/trunk/include/images/SkMovie.h b/gfx/skia/skia/include/images/SkMovie.h similarity index 100% rename from gfx/skia/trunk/include/images/SkMovie.h rename to gfx/skia/skia/include/images/SkMovie.h diff --git a/gfx/skia/trunk/include/images/SkPageFlipper.h b/gfx/skia/skia/include/images/SkPageFlipper.h similarity index 100% rename from gfx/skia/trunk/include/images/SkPageFlipper.h rename to gfx/skia/skia/include/images/SkPageFlipper.h diff --git a/gfx/skia/trunk/include/pathops/SkPathOps.h b/gfx/skia/skia/include/pathops/SkPathOps.h similarity index 100% rename from gfx/skia/trunk/include/pathops/SkPathOps.h rename to gfx/skia/skia/include/pathops/SkPathOps.h diff --git a/gfx/skia/trunk/include/pdf/SkPDFDevice.h b/gfx/skia/skia/include/pdf/SkPDFDevice.h similarity index 100% rename from gfx/skia/trunk/include/pdf/SkPDFDevice.h rename to gfx/skia/skia/include/pdf/SkPDFDevice.h diff --git a/gfx/skia/trunk/include/pdf/SkPDFDocument.h b/gfx/skia/skia/include/pdf/SkPDFDocument.h similarity index 100% rename from gfx/skia/trunk/include/pdf/SkPDFDocument.h rename to gfx/skia/skia/include/pdf/SkPDFDocument.h diff --git a/gfx/skia/trunk/include/pipe/SkGPipe.h b/gfx/skia/skia/include/pipe/SkGPipe.h similarity index 100% rename from gfx/skia/trunk/include/pipe/SkGPipe.h rename to gfx/skia/skia/include/pipe/SkGPipe.h diff --git a/gfx/skia/trunk/include/ports/SkFontConfigInterface.h b/gfx/skia/skia/include/ports/SkFontConfigInterface.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkFontConfigInterface.h rename to gfx/skia/skia/include/ports/SkFontConfigInterface.h diff --git a/gfx/skia/trunk/include/ports/SkFontMgr.h b/gfx/skia/skia/include/ports/SkFontMgr.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkFontMgr.h rename to gfx/skia/skia/include/ports/SkFontMgr.h diff --git a/gfx/skia/trunk/include/ports/SkFontMgr_indirect.h b/gfx/skia/skia/include/ports/SkFontMgr_indirect.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkFontMgr_indirect.h rename to gfx/skia/skia/include/ports/SkFontMgr_indirect.h diff --git a/gfx/skia/trunk/include/ports/SkFontStyle.h b/gfx/skia/skia/include/ports/SkFontStyle.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkFontStyle.h rename to gfx/skia/skia/include/ports/SkFontStyle.h diff --git a/gfx/skia/trunk/include/ports/SkRemotableFontMgr.h b/gfx/skia/skia/include/ports/SkRemotableFontMgr.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkRemotableFontMgr.h rename to gfx/skia/skia/include/ports/SkRemotableFontMgr.h diff --git a/gfx/skia/trunk/include/ports/SkTypeface_android.h b/gfx/skia/skia/include/ports/SkTypeface_android.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkTypeface_android.h rename to gfx/skia/skia/include/ports/SkTypeface_android.h diff --git a/gfx/skia/trunk/include/ports/SkTypeface_cairo.h b/gfx/skia/skia/include/ports/SkTypeface_cairo.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkTypeface_cairo.h rename to gfx/skia/skia/include/ports/SkTypeface_cairo.h diff --git a/gfx/skia/trunk/include/ports/SkTypeface_mac.h b/gfx/skia/skia/include/ports/SkTypeface_mac.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkTypeface_mac.h rename to gfx/skia/skia/include/ports/SkTypeface_mac.h diff --git a/gfx/skia/trunk/include/ports/SkTypeface_win.h b/gfx/skia/skia/include/ports/SkTypeface_win.h similarity index 100% rename from gfx/skia/trunk/include/ports/SkTypeface_win.h rename to gfx/skia/skia/include/ports/SkTypeface_win.h diff --git a/gfx/skia/trunk/include/record/SkRecording.h b/gfx/skia/skia/include/record/SkRecording.h similarity index 100% rename from gfx/skia/trunk/include/record/SkRecording.h rename to gfx/skia/skia/include/record/SkRecording.h diff --git a/gfx/skia/trunk/include/svg/SkSVGAttribute.h b/gfx/skia/skia/include/svg/SkSVGAttribute.h similarity index 100% rename from gfx/skia/trunk/include/svg/SkSVGAttribute.h rename to gfx/skia/skia/include/svg/SkSVGAttribute.h diff --git a/gfx/skia/trunk/include/svg/SkSVGBase.h b/gfx/skia/skia/include/svg/SkSVGBase.h similarity index 100% rename from gfx/skia/trunk/include/svg/SkSVGBase.h rename to gfx/skia/skia/include/svg/SkSVGBase.h diff --git a/gfx/skia/trunk/include/svg/SkSVGPaintState.h b/gfx/skia/skia/include/svg/SkSVGPaintState.h similarity index 100% rename from gfx/skia/trunk/include/svg/SkSVGPaintState.h rename to gfx/skia/skia/include/svg/SkSVGPaintState.h diff --git a/gfx/skia/trunk/include/svg/SkSVGParser.h b/gfx/skia/skia/include/svg/SkSVGParser.h similarity index 100% rename from gfx/skia/trunk/include/svg/SkSVGParser.h rename to gfx/skia/skia/include/svg/SkSVGParser.h diff --git a/gfx/skia/trunk/include/svg/SkSVGTypes.h b/gfx/skia/skia/include/svg/SkSVGTypes.h similarity index 100% rename from gfx/skia/trunk/include/svg/SkSVGTypes.h rename to gfx/skia/skia/include/svg/SkSVGTypes.h diff --git a/gfx/skia/trunk/include/utils/SkBoundaryPatch.h b/gfx/skia/skia/include/utils/SkBoundaryPatch.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkBoundaryPatch.h rename to gfx/skia/skia/include/utils/SkBoundaryPatch.h diff --git a/gfx/skia/trunk/include/utils/SkCamera.h b/gfx/skia/skia/include/utils/SkCamera.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkCamera.h rename to gfx/skia/skia/include/utils/SkCamera.h diff --git a/gfx/skia/trunk/include/utils/SkCanvasStateUtils.h b/gfx/skia/skia/include/utils/SkCanvasStateUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkCanvasStateUtils.h rename to gfx/skia/skia/include/utils/SkCanvasStateUtils.h diff --git a/gfx/skia/trunk/include/utils/SkCondVar.h b/gfx/skia/skia/include/utils/SkCondVar.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkCondVar.h rename to gfx/skia/skia/include/utils/SkCondVar.h diff --git a/gfx/skia/trunk/include/utils/SkCubicInterval.h b/gfx/skia/skia/include/utils/SkCubicInterval.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkCubicInterval.h rename to gfx/skia/skia/include/utils/SkCubicInterval.h diff --git a/gfx/skia/trunk/include/utils/SkCullPoints.h b/gfx/skia/skia/include/utils/SkCullPoints.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkCullPoints.h rename to gfx/skia/skia/include/utils/SkCullPoints.h diff --git a/gfx/skia/trunk/include/utils/SkDebugUtils.h b/gfx/skia/skia/include/utils/SkDebugUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkDebugUtils.h rename to gfx/skia/skia/include/utils/SkDebugUtils.h diff --git a/gfx/skia/trunk/include/utils/SkDeferredCanvas.h b/gfx/skia/skia/include/utils/SkDeferredCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkDeferredCanvas.h rename to gfx/skia/skia/include/utils/SkDeferredCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkDumpCanvas.h b/gfx/skia/skia/include/utils/SkDumpCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkDumpCanvas.h rename to gfx/skia/skia/include/utils/SkDumpCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkEventTracer.h b/gfx/skia/skia/include/utils/SkEventTracer.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkEventTracer.h rename to gfx/skia/skia/include/utils/SkEventTracer.h diff --git a/gfx/skia/trunk/include/utils/SkFrontBufferedStream.h b/gfx/skia/skia/include/utils/SkFrontBufferedStream.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkFrontBufferedStream.h rename to gfx/skia/skia/include/utils/SkFrontBufferedStream.h diff --git a/gfx/skia/trunk/include/utils/SkInterpolator.h b/gfx/skia/skia/include/utils/SkInterpolator.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkInterpolator.h rename to gfx/skia/skia/include/utils/SkInterpolator.h diff --git a/gfx/skia/trunk/include/utils/SkJSONCPP.h b/gfx/skia/skia/include/utils/SkJSONCPP.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkJSONCPP.h rename to gfx/skia/skia/include/utils/SkJSONCPP.h diff --git a/gfx/skia/trunk/include/utils/SkLayer.h b/gfx/skia/skia/include/utils/SkLayer.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkLayer.h rename to gfx/skia/skia/include/utils/SkLayer.h diff --git a/gfx/skia/trunk/include/utils/SkLua.h b/gfx/skia/skia/include/utils/SkLua.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkLua.h rename to gfx/skia/skia/include/utils/SkLua.h diff --git a/gfx/skia/trunk/include/utils/SkLuaCanvas.h b/gfx/skia/skia/include/utils/SkLuaCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkLuaCanvas.h rename to gfx/skia/skia/include/utils/SkLuaCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkMatrix44.h b/gfx/skia/skia/include/utils/SkMatrix44.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkMatrix44.h rename to gfx/skia/skia/include/utils/SkMatrix44.h diff --git a/gfx/skia/trunk/include/utils/SkMeshUtils.h b/gfx/skia/skia/include/utils/SkMeshUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkMeshUtils.h rename to gfx/skia/skia/include/utils/SkMeshUtils.h diff --git a/gfx/skia/trunk/include/utils/SkNWayCanvas.h b/gfx/skia/skia/include/utils/SkNWayCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkNWayCanvas.h rename to gfx/skia/skia/include/utils/SkNWayCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkNinePatch.h b/gfx/skia/skia/include/utils/SkNinePatch.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkNinePatch.h rename to gfx/skia/skia/include/utils/SkNinePatch.h diff --git a/gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h b/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h rename to gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkNullCanvas.h b/gfx/skia/skia/include/utils/SkNullCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkNullCanvas.h rename to gfx/skia/skia/include/utils/SkNullCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkParse.h b/gfx/skia/skia/include/utils/SkParse.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkParse.h rename to gfx/skia/skia/include/utils/SkParse.h diff --git a/gfx/skia/trunk/include/utils/SkParsePaint.h b/gfx/skia/skia/include/utils/SkParsePaint.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkParsePaint.h rename to gfx/skia/skia/include/utils/SkParsePaint.h diff --git a/gfx/skia/trunk/include/utils/SkParsePath.h b/gfx/skia/skia/include/utils/SkParsePath.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkParsePath.h rename to gfx/skia/skia/include/utils/SkParsePath.h diff --git a/gfx/skia/trunk/include/utils/SkPathUtils.h b/gfx/skia/skia/include/utils/SkPathUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkPathUtils.h rename to gfx/skia/skia/include/utils/SkPathUtils.h diff --git a/gfx/skia/trunk/include/utils/SkPictureUtils.h b/gfx/skia/skia/include/utils/SkPictureUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkPictureUtils.h rename to gfx/skia/skia/include/utils/SkPictureUtils.h diff --git a/gfx/skia/trunk/include/utils/SkProxyCanvas.h b/gfx/skia/skia/include/utils/SkProxyCanvas.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkProxyCanvas.h rename to gfx/skia/skia/include/utils/SkProxyCanvas.h diff --git a/gfx/skia/trunk/include/utils/SkRTConf.h b/gfx/skia/skia/include/utils/SkRTConf.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkRTConf.h rename to gfx/skia/skia/include/utils/SkRTConf.h diff --git a/gfx/skia/trunk/include/utils/SkRandom.h b/gfx/skia/skia/include/utils/SkRandom.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkRandom.h rename to gfx/skia/skia/include/utils/SkRandom.h diff --git a/gfx/skia/trunk/include/utils/SkRunnable.h b/gfx/skia/skia/include/utils/SkRunnable.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkRunnable.h rename to gfx/skia/skia/include/utils/SkRunnable.h diff --git a/gfx/skia/trunk/include/utils/SkThreadPool.h b/gfx/skia/skia/include/utils/SkThreadPool.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkThreadPool.h rename to gfx/skia/skia/include/utils/SkThreadPool.h diff --git a/gfx/skia/trunk/include/utils/SkWGL.h b/gfx/skia/skia/include/utils/SkWGL.h similarity index 100% rename from gfx/skia/trunk/include/utils/SkWGL.h rename to gfx/skia/skia/include/utils/SkWGL.h diff --git a/gfx/skia/trunk/include/utils/ios/SkStream_NSData.h b/gfx/skia/skia/include/utils/ios/SkStream_NSData.h similarity index 100% rename from gfx/skia/trunk/include/utils/ios/SkStream_NSData.h rename to gfx/skia/skia/include/utils/ios/SkStream_NSData.h diff --git a/gfx/skia/trunk/include/utils/mac/SkCGUtils.h b/gfx/skia/skia/include/utils/mac/SkCGUtils.h similarity index 100% rename from gfx/skia/trunk/include/utils/mac/SkCGUtils.h rename to gfx/skia/skia/include/utils/mac/SkCGUtils.h diff --git a/gfx/skia/trunk/include/utils/win/SkAutoCoInitialize.h b/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h similarity index 100% rename from gfx/skia/trunk/include/utils/win/SkAutoCoInitialize.h rename to gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h diff --git a/gfx/skia/trunk/include/utils/win/SkHRESULT.h b/gfx/skia/skia/include/utils/win/SkHRESULT.h similarity index 100% rename from gfx/skia/trunk/include/utils/win/SkHRESULT.h rename to gfx/skia/skia/include/utils/win/SkHRESULT.h diff --git a/gfx/skia/trunk/include/utils/win/SkIStream.h b/gfx/skia/skia/include/utils/win/SkIStream.h similarity index 100% rename from gfx/skia/trunk/include/utils/win/SkIStream.h rename to gfx/skia/skia/include/utils/win/SkIStream.h diff --git a/gfx/skia/trunk/include/utils/win/SkTScopedComPtr.h b/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h similarity index 100% rename from gfx/skia/trunk/include/utils/win/SkTScopedComPtr.h rename to gfx/skia/skia/include/utils/win/SkTScopedComPtr.h diff --git a/gfx/skia/trunk/include/views/SkApplication.h b/gfx/skia/skia/include/views/SkApplication.h similarity index 100% rename from gfx/skia/trunk/include/views/SkApplication.h rename to gfx/skia/skia/include/views/SkApplication.h diff --git a/gfx/skia/trunk/include/views/SkBGViewArtist.h b/gfx/skia/skia/include/views/SkBGViewArtist.h similarity index 100% rename from gfx/skia/trunk/include/views/SkBGViewArtist.h rename to gfx/skia/skia/include/views/SkBGViewArtist.h diff --git a/gfx/skia/trunk/include/views/SkEvent.h b/gfx/skia/skia/include/views/SkEvent.h similarity index 100% rename from gfx/skia/trunk/include/views/SkEvent.h rename to gfx/skia/skia/include/views/SkEvent.h diff --git a/gfx/skia/trunk/include/views/SkEventSink.h b/gfx/skia/skia/include/views/SkEventSink.h similarity index 100% rename from gfx/skia/trunk/include/views/SkEventSink.h rename to gfx/skia/skia/include/views/SkEventSink.h diff --git a/gfx/skia/trunk/include/views/SkKey.h b/gfx/skia/skia/include/views/SkKey.h similarity index 100% rename from gfx/skia/trunk/include/views/SkKey.h rename to gfx/skia/skia/include/views/SkKey.h diff --git a/gfx/skia/trunk/include/views/SkOSMenu.h b/gfx/skia/skia/include/views/SkOSMenu.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSMenu.h rename to gfx/skia/skia/include/views/SkOSMenu.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Android.h b/gfx/skia/skia/include/views/SkOSWindow_Android.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_Android.h rename to gfx/skia/skia/include/views/SkOSWindow_Android.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Mac.h b/gfx/skia/skia/include/views/SkOSWindow_Mac.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_Mac.h rename to gfx/skia/skia/include/views/SkOSWindow_Mac.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_NaCl.h b/gfx/skia/skia/include/views/SkOSWindow_NaCl.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_NaCl.h rename to gfx/skia/skia/include/views/SkOSWindow_NaCl.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_SDL.h b/gfx/skia/skia/include/views/SkOSWindow_SDL.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_SDL.h rename to gfx/skia/skia/include/views/SkOSWindow_SDL.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Unix.h b/gfx/skia/skia/include/views/SkOSWindow_Unix.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_Unix.h rename to gfx/skia/skia/include/views/SkOSWindow_Unix.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Win.h b/gfx/skia/skia/include/views/SkOSWindow_Win.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_Win.h rename to gfx/skia/skia/include/views/SkOSWindow_Win.h diff --git a/gfx/skia/trunk/include/views/SkOSWindow_iOS.h b/gfx/skia/skia/include/views/SkOSWindow_iOS.h similarity index 100% rename from gfx/skia/trunk/include/views/SkOSWindow_iOS.h rename to gfx/skia/skia/include/views/SkOSWindow_iOS.h diff --git a/gfx/skia/trunk/include/views/SkStackViewLayout.h b/gfx/skia/skia/include/views/SkStackViewLayout.h similarity index 100% rename from gfx/skia/trunk/include/views/SkStackViewLayout.h rename to gfx/skia/skia/include/views/SkStackViewLayout.h diff --git a/gfx/skia/trunk/include/views/SkSystemEventTypes.h b/gfx/skia/skia/include/views/SkSystemEventTypes.h similarity index 100% rename from gfx/skia/trunk/include/views/SkSystemEventTypes.h rename to gfx/skia/skia/include/views/SkSystemEventTypes.h diff --git a/gfx/skia/trunk/include/views/SkTextBox.h b/gfx/skia/skia/include/views/SkTextBox.h similarity index 100% rename from gfx/skia/trunk/include/views/SkTextBox.h rename to gfx/skia/skia/include/views/SkTextBox.h diff --git a/gfx/skia/trunk/include/views/SkTouchGesture.h b/gfx/skia/skia/include/views/SkTouchGesture.h similarity index 100% rename from gfx/skia/trunk/include/views/SkTouchGesture.h rename to gfx/skia/skia/include/views/SkTouchGesture.h diff --git a/gfx/skia/trunk/include/views/SkView.h b/gfx/skia/skia/include/views/SkView.h similarity index 100% rename from gfx/skia/trunk/include/views/SkView.h rename to gfx/skia/skia/include/views/SkView.h diff --git a/gfx/skia/trunk/include/views/SkViewInflate.h b/gfx/skia/skia/include/views/SkViewInflate.h similarity index 100% rename from gfx/skia/trunk/include/views/SkViewInflate.h rename to gfx/skia/skia/include/views/SkViewInflate.h diff --git a/gfx/skia/trunk/include/views/SkWidget.h b/gfx/skia/skia/include/views/SkWidget.h similarity index 100% rename from gfx/skia/trunk/include/views/SkWidget.h rename to gfx/skia/skia/include/views/SkWidget.h diff --git a/gfx/skia/trunk/include/views/SkWindow.h b/gfx/skia/skia/include/views/SkWindow.h similarity index 100% rename from gfx/skia/trunk/include/views/SkWindow.h rename to gfx/skia/skia/include/views/SkWindow.h diff --git a/gfx/skia/trunk/include/views/android/AndroidKeyToSkKey.h b/gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h similarity index 100% rename from gfx/skia/trunk/include/views/android/AndroidKeyToSkKey.h rename to gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h diff --git a/gfx/skia/trunk/include/views/animated/SkBorderView.h b/gfx/skia/skia/include/views/animated/SkBorderView.h similarity index 100% rename from gfx/skia/trunk/include/views/animated/SkBorderView.h rename to gfx/skia/skia/include/views/animated/SkBorderView.h diff --git a/gfx/skia/trunk/include/views/animated/SkImageView.h b/gfx/skia/skia/include/views/animated/SkImageView.h similarity index 100% rename from gfx/skia/trunk/include/views/animated/SkImageView.h rename to gfx/skia/skia/include/views/animated/SkImageView.h diff --git a/gfx/skia/trunk/include/views/animated/SkProgressBarView.h b/gfx/skia/skia/include/views/animated/SkProgressBarView.h similarity index 100% rename from gfx/skia/trunk/include/views/animated/SkProgressBarView.h rename to gfx/skia/skia/include/views/animated/SkProgressBarView.h diff --git a/gfx/skia/trunk/include/views/animated/SkScrollBarView.h b/gfx/skia/skia/include/views/animated/SkScrollBarView.h similarity index 100% rename from gfx/skia/trunk/include/views/animated/SkScrollBarView.h rename to gfx/skia/skia/include/views/animated/SkScrollBarView.h diff --git a/gfx/skia/trunk/include/views/animated/SkWidgetViews.h b/gfx/skia/skia/include/views/animated/SkWidgetViews.h similarity index 100% rename from gfx/skia/trunk/include/views/animated/SkWidgetViews.h rename to gfx/skia/skia/include/views/animated/SkWidgetViews.h diff --git a/gfx/skia/trunk/include/views/unix/XkeysToSkKeys.h b/gfx/skia/skia/include/views/unix/XkeysToSkKeys.h similarity index 100% rename from gfx/skia/trunk/include/views/unix/XkeysToSkKeys.h rename to gfx/skia/skia/include/views/unix/XkeysToSkKeys.h diff --git a/gfx/skia/trunk/include/views/unix/keysym2ucs.h b/gfx/skia/skia/include/views/unix/keysym2ucs.h similarity index 100% rename from gfx/skia/trunk/include/views/unix/keysym2ucs.h rename to gfx/skia/skia/include/views/unix/keysym2ucs.h diff --git a/gfx/skia/trunk/include/xml/SkBML_WXMLParser.h b/gfx/skia/skia/include/xml/SkBML_WXMLParser.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkBML_WXMLParser.h rename to gfx/skia/skia/include/xml/SkBML_WXMLParser.h diff --git a/gfx/skia/trunk/include/xml/SkBML_XMLParser.h b/gfx/skia/skia/include/xml/SkBML_XMLParser.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkBML_XMLParser.h rename to gfx/skia/skia/include/xml/SkBML_XMLParser.h diff --git a/gfx/skia/trunk/include/xml/SkDOM.h b/gfx/skia/skia/include/xml/SkDOM.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkDOM.h rename to gfx/skia/skia/include/xml/SkDOM.h diff --git a/gfx/skia/trunk/include/xml/SkJS.h b/gfx/skia/skia/include/xml/SkJS.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkJS.h rename to gfx/skia/skia/include/xml/SkJS.h diff --git a/gfx/skia/trunk/include/xml/SkXMLParser.h b/gfx/skia/skia/include/xml/SkXMLParser.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkXMLParser.h rename to gfx/skia/skia/include/xml/SkXMLParser.h diff --git a/gfx/skia/trunk/include/xml/SkXMLWriter.h b/gfx/skia/skia/include/xml/SkXMLWriter.h similarity index 100% rename from gfx/skia/trunk/include/xml/SkXMLWriter.h rename to gfx/skia/skia/include/xml/SkXMLWriter.h diff --git a/gfx/skia/trunk/src/animator/SkAnimate.h b/gfx/skia/skia/src/animator/SkAnimate.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimate.h rename to gfx/skia/skia/src/animator/SkAnimate.h diff --git a/gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsd b/gfx/skia/skia/src/animator/SkAnimate3DSchema.xsd similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsd rename to gfx/skia/skia/src/animator/SkAnimate3DSchema.xsd diff --git a/gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsx b/gfx/skia/skia/src/animator/SkAnimate3DSchema.xsx similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsx rename to gfx/skia/skia/src/animator/SkAnimate3DSchema.xsx diff --git a/gfx/skia/trunk/src/animator/SkAnimateActive.cpp b/gfx/skia/skia/src/animator/SkAnimateActive.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateActive.cpp rename to gfx/skia/skia/src/animator/SkAnimateActive.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimateActive.h b/gfx/skia/skia/src/animator/SkAnimateActive.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateActive.h rename to gfx/skia/skia/src/animator/SkAnimateActive.h diff --git a/gfx/skia/trunk/src/animator/SkAnimateBase.cpp b/gfx/skia/skia/src/animator/SkAnimateBase.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateBase.cpp rename to gfx/skia/skia/src/animator/SkAnimateBase.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimateBase.h b/gfx/skia/skia/src/animator/SkAnimateBase.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateBase.h rename to gfx/skia/skia/src/animator/SkAnimateBase.h diff --git a/gfx/skia/trunk/src/animator/SkAnimateField.cpp b/gfx/skia/skia/src/animator/SkAnimateField.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateField.cpp rename to gfx/skia/skia/src/animator/SkAnimateField.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimateMaker.cpp b/gfx/skia/skia/src/animator/SkAnimateMaker.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateMaker.cpp rename to gfx/skia/skia/src/animator/SkAnimateMaker.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimateMaker.h b/gfx/skia/skia/src/animator/SkAnimateMaker.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateMaker.h rename to gfx/skia/skia/src/animator/SkAnimateMaker.h diff --git a/gfx/skia/trunk/src/animator/SkAnimateProperties.h b/gfx/skia/skia/src/animator/SkAnimateProperties.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateProperties.h rename to gfx/skia/skia/src/animator/SkAnimateProperties.h diff --git a/gfx/skia/trunk/src/animator/SkAnimateSchema.xsd b/gfx/skia/skia/src/animator/SkAnimateSchema.xsd similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateSchema.xsd rename to gfx/skia/skia/src/animator/SkAnimateSchema.xsd diff --git a/gfx/skia/trunk/src/animator/SkAnimateSchema.xsx b/gfx/skia/skia/src/animator/SkAnimateSchema.xsx similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateSchema.xsx rename to gfx/skia/skia/src/animator/SkAnimateSchema.xsx diff --git a/gfx/skia/trunk/src/animator/SkAnimateSet.cpp b/gfx/skia/skia/src/animator/SkAnimateSet.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateSet.cpp rename to gfx/skia/skia/src/animator/SkAnimateSet.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimateSet.h b/gfx/skia/skia/src/animator/SkAnimateSet.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimateSet.h rename to gfx/skia/skia/src/animator/SkAnimateSet.h diff --git a/gfx/skia/trunk/src/animator/SkAnimator.cpp b/gfx/skia/skia/src/animator/SkAnimator.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimator.cpp rename to gfx/skia/skia/src/animator/SkAnimator.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimatorScript.cpp rename to gfx/skia/skia/src/animator/SkAnimatorScript.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript.h b/gfx/skia/skia/src/animator/SkAnimatorScript.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimatorScript.h rename to gfx/skia/skia/src/animator/SkAnimatorScript.h diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript2.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimatorScript2.cpp rename to gfx/skia/skia/src/animator/SkAnimatorScript2.cpp diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript2.h b/gfx/skia/skia/src/animator/SkAnimatorScript2.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkAnimatorScript2.h rename to gfx/skia/skia/src/animator/SkAnimatorScript2.h diff --git a/gfx/skia/trunk/src/animator/SkBoundable.cpp b/gfx/skia/skia/src/animator/SkBoundable.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkBoundable.cpp rename to gfx/skia/skia/src/animator/SkBoundable.cpp diff --git a/gfx/skia/trunk/src/animator/SkBoundable.h b/gfx/skia/skia/src/animator/SkBoundable.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkBoundable.h rename to gfx/skia/skia/src/animator/SkBoundable.h diff --git a/gfx/skia/trunk/src/animator/SkBuildCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkBuildCondensedInfo.cpp rename to gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp diff --git a/gfx/skia/trunk/src/animator/SkCondensedDebug.cpp b/gfx/skia/skia/src/animator/SkCondensedDebug.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkCondensedDebug.cpp rename to gfx/skia/skia/src/animator/SkCondensedDebug.cpp diff --git a/gfx/skia/trunk/src/animator/SkCondensedRelease.cpp b/gfx/skia/skia/src/animator/SkCondensedRelease.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkCondensedRelease.cpp rename to gfx/skia/skia/src/animator/SkCondensedRelease.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayAdd.cpp b/gfx/skia/skia/src/animator/SkDisplayAdd.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayAdd.cpp rename to gfx/skia/skia/src/animator/SkDisplayAdd.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayAdd.h b/gfx/skia/skia/src/animator/SkDisplayAdd.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayAdd.h rename to gfx/skia/skia/src/animator/SkDisplayAdd.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayApply.cpp b/gfx/skia/skia/src/animator/SkDisplayApply.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayApply.cpp rename to gfx/skia/skia/src/animator/SkDisplayApply.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayApply.h b/gfx/skia/skia/src/animator/SkDisplayApply.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayApply.h rename to gfx/skia/skia/src/animator/SkDisplayApply.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayBounds.cpp b/gfx/skia/skia/src/animator/SkDisplayBounds.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayBounds.cpp rename to gfx/skia/skia/src/animator/SkDisplayBounds.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayBounds.h b/gfx/skia/skia/src/animator/SkDisplayBounds.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayBounds.h rename to gfx/skia/skia/src/animator/SkDisplayBounds.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvent.cpp b/gfx/skia/skia/src/animator/SkDisplayEvent.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayEvent.cpp rename to gfx/skia/skia/src/animator/SkDisplayEvent.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvent.h b/gfx/skia/skia/src/animator/SkDisplayEvent.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayEvent.h rename to gfx/skia/skia/src/animator/SkDisplayEvent.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvents.cpp b/gfx/skia/skia/src/animator/SkDisplayEvents.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayEvents.cpp rename to gfx/skia/skia/src/animator/SkDisplayEvents.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvents.h b/gfx/skia/skia/src/animator/SkDisplayEvents.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayEvents.h rename to gfx/skia/skia/src/animator/SkDisplayEvents.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayInclude.cpp b/gfx/skia/skia/src/animator/SkDisplayInclude.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayInclude.cpp rename to gfx/skia/skia/src/animator/SkDisplayInclude.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayInclude.h b/gfx/skia/skia/src/animator/SkDisplayInclude.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayInclude.h rename to gfx/skia/skia/src/animator/SkDisplayInclude.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayInput.cpp b/gfx/skia/skia/src/animator/SkDisplayInput.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayInput.cpp rename to gfx/skia/skia/src/animator/SkDisplayInput.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayInput.h b/gfx/skia/skia/src/animator/SkDisplayInput.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayInput.h rename to gfx/skia/skia/src/animator/SkDisplayInput.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayList.cpp b/gfx/skia/skia/src/animator/SkDisplayList.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayList.cpp rename to gfx/skia/skia/src/animator/SkDisplayList.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayList.h b/gfx/skia/skia/src/animator/SkDisplayList.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayList.h rename to gfx/skia/skia/src/animator/SkDisplayList.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayMath.cpp b/gfx/skia/skia/src/animator/SkDisplayMath.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayMath.cpp rename to gfx/skia/skia/src/animator/SkDisplayMath.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayMath.h b/gfx/skia/skia/src/animator/SkDisplayMath.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayMath.h rename to gfx/skia/skia/src/animator/SkDisplayMath.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayMovie.cpp b/gfx/skia/skia/src/animator/SkDisplayMovie.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayMovie.cpp rename to gfx/skia/skia/src/animator/SkDisplayMovie.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayMovie.h b/gfx/skia/skia/src/animator/SkDisplayMovie.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayMovie.h rename to gfx/skia/skia/src/animator/SkDisplayMovie.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayNumber.cpp b/gfx/skia/skia/src/animator/SkDisplayNumber.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayNumber.cpp rename to gfx/skia/skia/src/animator/SkDisplayNumber.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayNumber.h b/gfx/skia/skia/src/animator/SkDisplayNumber.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayNumber.h rename to gfx/skia/skia/src/animator/SkDisplayNumber.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayPost.cpp b/gfx/skia/skia/src/animator/SkDisplayPost.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayPost.cpp rename to gfx/skia/skia/src/animator/SkDisplayPost.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayPost.h b/gfx/skia/skia/src/animator/SkDisplayPost.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayPost.h rename to gfx/skia/skia/src/animator/SkDisplayPost.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayRandom.cpp b/gfx/skia/skia/src/animator/SkDisplayRandom.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayRandom.cpp rename to gfx/skia/skia/src/animator/SkDisplayRandom.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayRandom.h b/gfx/skia/skia/src/animator/SkDisplayRandom.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayRandom.h rename to gfx/skia/skia/src/animator/SkDisplayRandom.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayScreenplay.cpp b/gfx/skia/skia/src/animator/SkDisplayScreenplay.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayScreenplay.cpp rename to gfx/skia/skia/src/animator/SkDisplayScreenplay.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayScreenplay.h b/gfx/skia/skia/src/animator/SkDisplayScreenplay.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayScreenplay.h rename to gfx/skia/skia/src/animator/SkDisplayScreenplay.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayType.cpp b/gfx/skia/skia/src/animator/SkDisplayType.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayType.cpp rename to gfx/skia/skia/src/animator/SkDisplayType.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayType.h b/gfx/skia/skia/src/animator/SkDisplayType.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayType.h rename to gfx/skia/skia/src/animator/SkDisplayType.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayTypes.cpp b/gfx/skia/skia/src/animator/SkDisplayTypes.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayTypes.cpp rename to gfx/skia/skia/src/animator/SkDisplayTypes.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayTypes.h b/gfx/skia/skia/src/animator/SkDisplayTypes.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayTypes.h rename to gfx/skia/skia/src/animator/SkDisplayTypes.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayXMLParser.cpp b/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayXMLParser.cpp rename to gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayXMLParser.h b/gfx/skia/skia/src/animator/SkDisplayXMLParser.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayXMLParser.h rename to gfx/skia/skia/src/animator/SkDisplayXMLParser.h diff --git a/gfx/skia/trunk/src/animator/SkDisplayable.cpp b/gfx/skia/skia/src/animator/SkDisplayable.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayable.cpp rename to gfx/skia/skia/src/animator/SkDisplayable.cpp diff --git a/gfx/skia/trunk/src/animator/SkDisplayable.h b/gfx/skia/skia/src/animator/SkDisplayable.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDisplayable.h rename to gfx/skia/skia/src/animator/SkDisplayable.h diff --git a/gfx/skia/trunk/src/animator/SkDraw3D.cpp b/gfx/skia/skia/src/animator/SkDraw3D.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDraw3D.cpp rename to gfx/skia/skia/src/animator/SkDraw3D.cpp diff --git a/gfx/skia/trunk/src/animator/SkDraw3D.h b/gfx/skia/skia/src/animator/SkDraw3D.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDraw3D.h rename to gfx/skia/skia/src/animator/SkDraw3D.h diff --git a/gfx/skia/trunk/src/animator/SkDrawBitmap.cpp b/gfx/skia/skia/src/animator/SkDrawBitmap.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawBitmap.cpp rename to gfx/skia/skia/src/animator/SkDrawBitmap.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawBitmap.h b/gfx/skia/skia/src/animator/SkDrawBitmap.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawBitmap.h rename to gfx/skia/skia/src/animator/SkDrawBitmap.h diff --git a/gfx/skia/trunk/src/animator/SkDrawBlur.cpp b/gfx/skia/skia/src/animator/SkDrawBlur.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawBlur.cpp rename to gfx/skia/skia/src/animator/SkDrawBlur.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawBlur.h b/gfx/skia/skia/src/animator/SkDrawBlur.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawBlur.h rename to gfx/skia/skia/src/animator/SkDrawBlur.h diff --git a/gfx/skia/trunk/src/animator/SkDrawClip.cpp b/gfx/skia/skia/src/animator/SkDrawClip.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawClip.cpp rename to gfx/skia/skia/src/animator/SkDrawClip.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawClip.h b/gfx/skia/skia/src/animator/SkDrawClip.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawClip.h rename to gfx/skia/skia/src/animator/SkDrawClip.h diff --git a/gfx/skia/trunk/src/animator/SkDrawColor.cpp b/gfx/skia/skia/src/animator/SkDrawColor.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawColor.cpp rename to gfx/skia/skia/src/animator/SkDrawColor.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawColor.h b/gfx/skia/skia/src/animator/SkDrawColor.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawColor.h rename to gfx/skia/skia/src/animator/SkDrawColor.h diff --git a/gfx/skia/trunk/src/animator/SkDrawDash.cpp b/gfx/skia/skia/src/animator/SkDrawDash.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawDash.cpp rename to gfx/skia/skia/src/animator/SkDrawDash.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawDash.h b/gfx/skia/skia/src/animator/SkDrawDash.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawDash.h rename to gfx/skia/skia/src/animator/SkDrawDash.h diff --git a/gfx/skia/trunk/src/animator/SkDrawDiscrete.cpp b/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawDiscrete.cpp rename to gfx/skia/skia/src/animator/SkDrawDiscrete.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawDiscrete.h b/gfx/skia/skia/src/animator/SkDrawDiscrete.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawDiscrete.h rename to gfx/skia/skia/src/animator/SkDrawDiscrete.h diff --git a/gfx/skia/trunk/src/animator/SkDrawEmboss.cpp b/gfx/skia/skia/src/animator/SkDrawEmboss.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawEmboss.cpp rename to gfx/skia/skia/src/animator/SkDrawEmboss.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawEmboss.h b/gfx/skia/skia/src/animator/SkDrawEmboss.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawEmboss.h rename to gfx/skia/skia/src/animator/SkDrawEmboss.h diff --git a/gfx/skia/trunk/src/animator/SkDrawExtraPathEffect.cpp b/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawExtraPathEffect.cpp rename to gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawFull.cpp b/gfx/skia/skia/src/animator/SkDrawFull.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawFull.cpp rename to gfx/skia/skia/src/animator/SkDrawFull.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawFull.h b/gfx/skia/skia/src/animator/SkDrawFull.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawFull.h rename to gfx/skia/skia/src/animator/SkDrawFull.h diff --git a/gfx/skia/trunk/src/animator/SkDrawGradient.cpp b/gfx/skia/skia/src/animator/SkDrawGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawGradient.cpp rename to gfx/skia/skia/src/animator/SkDrawGradient.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawGradient.h b/gfx/skia/skia/src/animator/SkDrawGradient.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawGradient.h rename to gfx/skia/skia/src/animator/SkDrawGradient.h diff --git a/gfx/skia/trunk/src/animator/SkDrawGroup.cpp b/gfx/skia/skia/src/animator/SkDrawGroup.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawGroup.cpp rename to gfx/skia/skia/src/animator/SkDrawGroup.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawGroup.h b/gfx/skia/skia/src/animator/SkDrawGroup.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawGroup.h rename to gfx/skia/skia/src/animator/SkDrawGroup.h diff --git a/gfx/skia/trunk/src/animator/SkDrawLine.cpp b/gfx/skia/skia/src/animator/SkDrawLine.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawLine.cpp rename to gfx/skia/skia/src/animator/SkDrawLine.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawLine.h b/gfx/skia/skia/src/animator/SkDrawLine.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawLine.h rename to gfx/skia/skia/src/animator/SkDrawLine.h diff --git a/gfx/skia/trunk/src/animator/SkDrawMatrix.cpp b/gfx/skia/skia/src/animator/SkDrawMatrix.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawMatrix.cpp rename to gfx/skia/skia/src/animator/SkDrawMatrix.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawMatrix.h b/gfx/skia/skia/src/animator/SkDrawMatrix.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawMatrix.h rename to gfx/skia/skia/src/animator/SkDrawMatrix.h diff --git a/gfx/skia/trunk/src/animator/SkDrawOval.cpp b/gfx/skia/skia/src/animator/SkDrawOval.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawOval.cpp rename to gfx/skia/skia/src/animator/SkDrawOval.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawOval.h b/gfx/skia/skia/src/animator/SkDrawOval.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawOval.h rename to gfx/skia/skia/src/animator/SkDrawOval.h diff --git a/gfx/skia/trunk/src/animator/SkDrawPaint.cpp b/gfx/skia/skia/src/animator/SkDrawPaint.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPaint.cpp rename to gfx/skia/skia/src/animator/SkDrawPaint.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawPaint.h b/gfx/skia/skia/src/animator/SkDrawPaint.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPaint.h rename to gfx/skia/skia/src/animator/SkDrawPaint.h diff --git a/gfx/skia/trunk/src/animator/SkDrawPath.cpp b/gfx/skia/skia/src/animator/SkDrawPath.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPath.cpp rename to gfx/skia/skia/src/animator/SkDrawPath.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawPath.h b/gfx/skia/skia/src/animator/SkDrawPath.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPath.h rename to gfx/skia/skia/src/animator/SkDrawPath.h diff --git a/gfx/skia/trunk/src/animator/SkDrawPoint.cpp b/gfx/skia/skia/src/animator/SkDrawPoint.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPoint.cpp rename to gfx/skia/skia/src/animator/SkDrawPoint.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawPoint.h b/gfx/skia/skia/src/animator/SkDrawPoint.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawPoint.h rename to gfx/skia/skia/src/animator/SkDrawPoint.h diff --git a/gfx/skia/trunk/src/animator/SkDrawRectangle.cpp b/gfx/skia/skia/src/animator/SkDrawRectangle.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawRectangle.cpp rename to gfx/skia/skia/src/animator/SkDrawRectangle.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawRectangle.h b/gfx/skia/skia/src/animator/SkDrawRectangle.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawRectangle.h rename to gfx/skia/skia/src/animator/SkDrawRectangle.h diff --git a/gfx/skia/trunk/src/animator/SkDrawSaveLayer.cpp b/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawSaveLayer.cpp rename to gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawSaveLayer.h b/gfx/skia/skia/src/animator/SkDrawSaveLayer.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawSaveLayer.h rename to gfx/skia/skia/src/animator/SkDrawSaveLayer.h diff --git a/gfx/skia/trunk/src/animator/SkDrawShader.cpp b/gfx/skia/skia/src/animator/SkDrawShader.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawShader.cpp rename to gfx/skia/skia/src/animator/SkDrawShader.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawShader.h b/gfx/skia/skia/src/animator/SkDrawShader.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawShader.h rename to gfx/skia/skia/src/animator/SkDrawShader.h diff --git a/gfx/skia/trunk/src/animator/SkDrawText.cpp b/gfx/skia/skia/src/animator/SkDrawText.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawText.cpp rename to gfx/skia/skia/src/animator/SkDrawText.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawText.h b/gfx/skia/skia/src/animator/SkDrawText.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawText.h rename to gfx/skia/skia/src/animator/SkDrawText.h diff --git a/gfx/skia/trunk/src/animator/SkDrawTextBox.cpp b/gfx/skia/skia/src/animator/SkDrawTextBox.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTextBox.cpp rename to gfx/skia/skia/src/animator/SkDrawTextBox.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawTextBox.h b/gfx/skia/skia/src/animator/SkDrawTextBox.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTextBox.h rename to gfx/skia/skia/src/animator/SkDrawTextBox.h diff --git a/gfx/skia/trunk/src/animator/SkDrawTo.cpp b/gfx/skia/skia/src/animator/SkDrawTo.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTo.cpp rename to gfx/skia/skia/src/animator/SkDrawTo.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawTo.h b/gfx/skia/skia/src/animator/SkDrawTo.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTo.h rename to gfx/skia/skia/src/animator/SkDrawTo.h diff --git a/gfx/skia/trunk/src/animator/SkDrawTransparentShader.cpp b/gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTransparentShader.cpp rename to gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawTransparentShader.h b/gfx/skia/skia/src/animator/SkDrawTransparentShader.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawTransparentShader.h rename to gfx/skia/skia/src/animator/SkDrawTransparentShader.h diff --git a/gfx/skia/trunk/src/animator/SkDrawable.cpp b/gfx/skia/skia/src/animator/SkDrawable.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawable.cpp rename to gfx/skia/skia/src/animator/SkDrawable.cpp diff --git a/gfx/skia/trunk/src/animator/SkDrawable.h b/gfx/skia/skia/src/animator/SkDrawable.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDrawable.h rename to gfx/skia/skia/src/animator/SkDrawable.h diff --git a/gfx/skia/trunk/src/animator/SkDump.cpp b/gfx/skia/skia/src/animator/SkDump.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkDump.cpp rename to gfx/skia/skia/src/animator/SkDump.cpp diff --git a/gfx/skia/trunk/src/animator/SkDump.h b/gfx/skia/skia/src/animator/SkDump.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkDump.h rename to gfx/skia/skia/src/animator/SkDump.h diff --git a/gfx/skia/trunk/src/animator/SkExtraPathEffects.xsd b/gfx/skia/skia/src/animator/SkExtraPathEffects.xsd similarity index 100% rename from gfx/skia/trunk/src/animator/SkExtraPathEffects.xsd rename to gfx/skia/skia/src/animator/SkExtraPathEffects.xsd diff --git a/gfx/skia/trunk/src/animator/SkExtras.h b/gfx/skia/skia/src/animator/SkExtras.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkExtras.h rename to gfx/skia/skia/src/animator/SkExtras.h diff --git a/gfx/skia/trunk/src/animator/SkGetCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkGetCondensedInfo.cpp rename to gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp diff --git a/gfx/skia/trunk/src/animator/SkHitClear.cpp b/gfx/skia/skia/src/animator/SkHitClear.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkHitClear.cpp rename to gfx/skia/skia/src/animator/SkHitClear.cpp diff --git a/gfx/skia/trunk/src/animator/SkHitClear.h b/gfx/skia/skia/src/animator/SkHitClear.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkHitClear.h rename to gfx/skia/skia/src/animator/SkHitClear.h diff --git a/gfx/skia/trunk/src/animator/SkHitTest.cpp b/gfx/skia/skia/src/animator/SkHitTest.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkHitTest.cpp rename to gfx/skia/skia/src/animator/SkHitTest.cpp diff --git a/gfx/skia/trunk/src/animator/SkHitTest.h b/gfx/skia/skia/src/animator/SkHitTest.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkHitTest.h rename to gfx/skia/skia/src/animator/SkHitTest.h diff --git a/gfx/skia/trunk/src/animator/SkIntArray.h b/gfx/skia/skia/src/animator/SkIntArray.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkIntArray.h rename to gfx/skia/skia/src/animator/SkIntArray.h diff --git a/gfx/skia/trunk/src/animator/SkMatrixParts.cpp b/gfx/skia/skia/src/animator/SkMatrixParts.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkMatrixParts.cpp rename to gfx/skia/skia/src/animator/SkMatrixParts.cpp diff --git a/gfx/skia/trunk/src/animator/SkMatrixParts.h b/gfx/skia/skia/src/animator/SkMatrixParts.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkMatrixParts.h rename to gfx/skia/skia/src/animator/SkMatrixParts.h diff --git a/gfx/skia/trunk/src/animator/SkMemberInfo.cpp b/gfx/skia/skia/src/animator/SkMemberInfo.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkMemberInfo.cpp rename to gfx/skia/skia/src/animator/SkMemberInfo.cpp diff --git a/gfx/skia/trunk/src/animator/SkMemberInfo.h b/gfx/skia/skia/src/animator/SkMemberInfo.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkMemberInfo.h rename to gfx/skia/skia/src/animator/SkMemberInfo.h diff --git a/gfx/skia/trunk/src/animator/SkOpArray.cpp b/gfx/skia/skia/src/animator/SkOpArray.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkOpArray.cpp rename to gfx/skia/skia/src/animator/SkOpArray.cpp diff --git a/gfx/skia/trunk/src/animator/SkOpArray.h b/gfx/skia/skia/src/animator/SkOpArray.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkOpArray.h rename to gfx/skia/skia/src/animator/SkOpArray.h diff --git a/gfx/skia/trunk/src/animator/SkOperand.h b/gfx/skia/skia/src/animator/SkOperand.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkOperand.h rename to gfx/skia/skia/src/animator/SkOperand.h diff --git a/gfx/skia/trunk/src/animator/SkOperand2.h b/gfx/skia/skia/src/animator/SkOperand2.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkOperand2.h rename to gfx/skia/skia/src/animator/SkOperand2.h diff --git a/gfx/skia/trunk/src/animator/SkOperandInterpolator.h b/gfx/skia/skia/src/animator/SkOperandInterpolator.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkOperandInterpolator.h rename to gfx/skia/skia/src/animator/SkOperandInterpolator.h diff --git a/gfx/skia/trunk/src/animator/SkOperandIterpolator.cpp b/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkOperandIterpolator.cpp rename to gfx/skia/skia/src/animator/SkOperandIterpolator.cpp diff --git a/gfx/skia/trunk/src/animator/SkPaintPart.cpp b/gfx/skia/skia/src/animator/SkPaintPart.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkPaintPart.cpp rename to gfx/skia/skia/src/animator/SkPaintPart.cpp diff --git a/gfx/skia/trunk/src/animator/SkPaintPart.h b/gfx/skia/skia/src/animator/SkPaintPart.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkPaintPart.h rename to gfx/skia/skia/src/animator/SkPaintPart.h diff --git a/gfx/skia/trunk/src/animator/SkParseSVGPath.cpp b/gfx/skia/skia/src/animator/SkParseSVGPath.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkParseSVGPath.cpp rename to gfx/skia/skia/src/animator/SkParseSVGPath.cpp diff --git a/gfx/skia/trunk/src/animator/SkPathParts.cpp b/gfx/skia/skia/src/animator/SkPathParts.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkPathParts.cpp rename to gfx/skia/skia/src/animator/SkPathParts.cpp diff --git a/gfx/skia/trunk/src/animator/SkPathParts.h b/gfx/skia/skia/src/animator/SkPathParts.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkPathParts.h rename to gfx/skia/skia/src/animator/SkPathParts.h diff --git a/gfx/skia/trunk/src/animator/SkPostParts.cpp b/gfx/skia/skia/src/animator/SkPostParts.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkPostParts.cpp rename to gfx/skia/skia/src/animator/SkPostParts.cpp diff --git a/gfx/skia/trunk/src/animator/SkPostParts.h b/gfx/skia/skia/src/animator/SkPostParts.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkPostParts.h rename to gfx/skia/skia/src/animator/SkPostParts.h diff --git a/gfx/skia/trunk/src/animator/SkScript.cpp b/gfx/skia/skia/src/animator/SkScript.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkScript.cpp rename to gfx/skia/skia/src/animator/SkScript.cpp diff --git a/gfx/skia/trunk/src/animator/SkScript.h b/gfx/skia/skia/src/animator/SkScript.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkScript.h rename to gfx/skia/skia/src/animator/SkScript.h diff --git a/gfx/skia/trunk/src/animator/SkScript2.h b/gfx/skia/skia/src/animator/SkScript2.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkScript2.h rename to gfx/skia/skia/src/animator/SkScript2.h diff --git a/gfx/skia/trunk/src/animator/SkScriptCallBack.h b/gfx/skia/skia/src/animator/SkScriptCallBack.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkScriptCallBack.h rename to gfx/skia/skia/src/animator/SkScriptCallBack.h diff --git a/gfx/skia/trunk/src/animator/SkScriptDecompile.cpp b/gfx/skia/skia/src/animator/SkScriptDecompile.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkScriptDecompile.cpp rename to gfx/skia/skia/src/animator/SkScriptDecompile.cpp diff --git a/gfx/skia/trunk/src/animator/SkScriptRuntime.cpp b/gfx/skia/skia/src/animator/SkScriptRuntime.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkScriptRuntime.cpp rename to gfx/skia/skia/src/animator/SkScriptRuntime.cpp diff --git a/gfx/skia/trunk/src/animator/SkScriptRuntime.h b/gfx/skia/skia/src/animator/SkScriptRuntime.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkScriptRuntime.h rename to gfx/skia/skia/src/animator/SkScriptRuntime.h diff --git a/gfx/skia/trunk/src/animator/SkScriptTokenizer.cpp b/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkScriptTokenizer.cpp rename to gfx/skia/skia/src/animator/SkScriptTokenizer.cpp diff --git a/gfx/skia/trunk/src/animator/SkSnapshot.cpp b/gfx/skia/skia/src/animator/SkSnapshot.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkSnapshot.cpp rename to gfx/skia/skia/src/animator/SkSnapshot.cpp diff --git a/gfx/skia/trunk/src/animator/SkSnapshot.h b/gfx/skia/skia/src/animator/SkSnapshot.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkSnapshot.h rename to gfx/skia/skia/src/animator/SkSnapshot.h diff --git a/gfx/skia/trunk/src/animator/SkTDArray_Experimental.h b/gfx/skia/skia/src/animator/SkTDArray_Experimental.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkTDArray_Experimental.h rename to gfx/skia/skia/src/animator/SkTDArray_Experimental.h diff --git a/gfx/skia/trunk/src/animator/SkTextOnPath.cpp b/gfx/skia/skia/src/animator/SkTextOnPath.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkTextOnPath.cpp rename to gfx/skia/skia/src/animator/SkTextOnPath.cpp diff --git a/gfx/skia/trunk/src/animator/SkTextOnPath.h b/gfx/skia/skia/src/animator/SkTextOnPath.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkTextOnPath.h rename to gfx/skia/skia/src/animator/SkTextOnPath.h diff --git a/gfx/skia/trunk/src/animator/SkTextToPath.cpp b/gfx/skia/skia/src/animator/SkTextToPath.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkTextToPath.cpp rename to gfx/skia/skia/src/animator/SkTextToPath.cpp diff --git a/gfx/skia/trunk/src/animator/SkTextToPath.h b/gfx/skia/skia/src/animator/SkTextToPath.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkTextToPath.h rename to gfx/skia/skia/src/animator/SkTextToPath.h diff --git a/gfx/skia/trunk/src/animator/SkTime.cpp b/gfx/skia/skia/src/animator/SkTime.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkTime.cpp rename to gfx/skia/skia/src/animator/SkTime.cpp diff --git a/gfx/skia/trunk/src/animator/SkTypedArray.cpp b/gfx/skia/skia/src/animator/SkTypedArray.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkTypedArray.cpp rename to gfx/skia/skia/src/animator/SkTypedArray.cpp diff --git a/gfx/skia/trunk/src/animator/SkTypedArray.h b/gfx/skia/skia/src/animator/SkTypedArray.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkTypedArray.h rename to gfx/skia/skia/src/animator/SkTypedArray.h diff --git a/gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.cpp b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp similarity index 100% rename from gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.cpp rename to gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp diff --git a/gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.h b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h similarity index 100% rename from gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.h rename to gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h diff --git a/gfx/skia/trunk/src/animator/thingstodo.txt b/gfx/skia/skia/src/animator/thingstodo.txt similarity index 100% rename from gfx/skia/trunk/src/animator/thingstodo.txt rename to gfx/skia/skia/src/animator/thingstodo.txt diff --git a/gfx/skia/trunk/src/core/SkAAClip.cpp b/gfx/skia/skia/src/core/SkAAClip.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkAAClip.cpp rename to gfx/skia/skia/src/core/SkAAClip.cpp diff --git a/gfx/skia/trunk/src/core/SkAAClip.h b/gfx/skia/skia/src/core/SkAAClip.h similarity index 100% rename from gfx/skia/trunk/src/core/SkAAClip.h rename to gfx/skia/skia/src/core/SkAAClip.h diff --git a/gfx/skia/trunk/src/core/SkAdvancedTypefaceMetrics.cpp b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkAdvancedTypefaceMetrics.cpp rename to gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp diff --git a/gfx/skia/trunk/src/core/SkAlphaRuns.cpp b/gfx/skia/skia/src/core/SkAlphaRuns.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkAlphaRuns.cpp rename to gfx/skia/skia/src/core/SkAlphaRuns.cpp diff --git a/gfx/skia/trunk/src/core/SkAnnotation.cpp b/gfx/skia/skia/src/core/SkAnnotation.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkAnnotation.cpp rename to gfx/skia/skia/src/core/SkAnnotation.cpp diff --git a/gfx/skia/trunk/src/core/SkAntiRun.h b/gfx/skia/skia/src/core/SkAntiRun.h similarity index 100% rename from gfx/skia/trunk/src/core/SkAntiRun.h rename to gfx/skia/skia/src/core/SkAntiRun.h diff --git a/gfx/skia/trunk/src/core/SkAutoKern.h b/gfx/skia/skia/src/core/SkAutoKern.h similarity index 100% rename from gfx/skia/trunk/src/core/SkAutoKern.h rename to gfx/skia/skia/src/core/SkAutoKern.h diff --git a/gfx/skia/trunk/src/core/SkBBHFactory.cpp b/gfx/skia/skia/src/core/SkBBHFactory.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBBHFactory.cpp rename to gfx/skia/skia/src/core/SkBBHFactory.cpp diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchy.h b/gfx/skia/skia/src/core/SkBBoxHierarchy.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBBoxHierarchy.h rename to gfx/skia/skia/src/core/SkBBoxHierarchy.h diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.cpp b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.cpp rename to gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.h b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.h rename to gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h diff --git a/gfx/skia/trunk/src/core/SkBBoxRecord.cpp b/gfx/skia/skia/src/core/SkBBoxRecord.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBBoxRecord.cpp rename to gfx/skia/skia/src/core/SkBBoxRecord.cpp diff --git a/gfx/skia/trunk/src/core/SkBBoxRecord.h b/gfx/skia/skia/src/core/SkBBoxRecord.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBBoxRecord.h rename to gfx/skia/skia/src/core/SkBBoxRecord.h diff --git a/gfx/skia/trunk/src/core/SkBitmap.cpp b/gfx/skia/skia/src/core/SkBitmap.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmap.cpp rename to gfx/skia/skia/src/core/SkBitmap.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapDevice.cpp b/gfx/skia/skia/src/core/SkBitmapDevice.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapDevice.cpp rename to gfx/skia/skia/src/core/SkBitmapDevice.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapFilter.cpp b/gfx/skia/skia/src/core/SkBitmapFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapFilter.cpp rename to gfx/skia/skia/src/core/SkBitmapFilter.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapFilter.h b/gfx/skia/skia/src/core/SkBitmapFilter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapFilter.h rename to gfx/skia/skia/src/core/SkBitmapFilter.h diff --git a/gfx/skia/trunk/src/core/SkBitmapHeap.cpp b/gfx/skia/skia/src/core/SkBitmapHeap.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapHeap.cpp rename to gfx/skia/skia/src/core/SkBitmapHeap.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapHeap.h b/gfx/skia/skia/src/core/SkBitmapHeap.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapHeap.h rename to gfx/skia/skia/src/core/SkBitmapHeap.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcShader.cpp b/gfx/skia/skia/src/core/SkBitmapProcShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcShader.cpp rename to gfx/skia/skia/src/core/SkBitmapProcShader.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapProcShader.h b/gfx/skia/skia/src/core/SkBitmapProcShader.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcShader.h rename to gfx/skia/skia/src/core/SkBitmapProcShader.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState.cpp b/gfx/skia/skia/src/core/SkBitmapProcState.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState.cpp rename to gfx/skia/skia/src/core/SkBitmapProcState.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState.h b/gfx/skia/skia/src/core/SkBitmapProcState.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState.h rename to gfx/skia/skia/src/core/SkBitmapProcState.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_filter.h b/gfx/skia/skia/src/core/SkBitmapProcState_filter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_filter.h rename to gfx/skia/skia/src/core/SkBitmapProcState_filter.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrix.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrix.h rename to gfx/skia/skia/src/core/SkBitmapProcState_matrix.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrixProcs.cpp b/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrixProcs.cpp rename to gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrix_template.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrix_template.h rename to gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_procs.h b/gfx/skia/skia/src/core/SkBitmapProcState_procs.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_procs.h rename to gfx/skia/skia/src/core/SkBitmapProcState_procs.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_sample.h b/gfx/skia/skia/src/core/SkBitmapProcState_sample.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_sample.h rename to gfx/skia/skia/src/core/SkBitmapProcState_sample.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_shaderproc.h b/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_shaderproc.h rename to gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_utils.h b/gfx/skia/skia/src/core/SkBitmapProcState_utils.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapProcState_utils.h rename to gfx/skia/skia/src/core/SkBitmapProcState_utils.h diff --git a/gfx/skia/trunk/src/core/SkBitmapScaler.cpp b/gfx/skia/skia/src/core/SkBitmapScaler.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapScaler.cpp rename to gfx/skia/skia/src/core/SkBitmapScaler.cpp diff --git a/gfx/skia/trunk/src/core/SkBitmapScaler.h b/gfx/skia/skia/src/core/SkBitmapScaler.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmapScaler.h rename to gfx/skia/skia/src/core/SkBitmapScaler.h diff --git a/gfx/skia/trunk/src/core/SkBitmap_scroll.cpp b/gfx/skia/skia/src/core/SkBitmap_scroll.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBitmap_scroll.cpp rename to gfx/skia/skia/src/core/SkBitmap_scroll.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitBWMaskTemplate.h b/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitBWMaskTemplate.h rename to gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h diff --git a/gfx/skia/trunk/src/core/SkBlitMask.h b/gfx/skia/skia/src/core/SkBlitMask.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitMask.h rename to gfx/skia/skia/src/core/SkBlitMask.h diff --git a/gfx/skia/trunk/src/core/SkBlitMask_D32.cpp b/gfx/skia/skia/src/core/SkBlitMask_D32.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitMask_D32.cpp rename to gfx/skia/skia/src/core/SkBlitMask_D32.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitRow_D16.cpp b/gfx/skia/skia/src/core/SkBlitRow_D16.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitRow_D16.cpp rename to gfx/skia/skia/src/core/SkBlitRow_D16.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitRow_D32.cpp b/gfx/skia/skia/src/core/SkBlitRow_D32.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitRow_D32.cpp rename to gfx/skia/skia/src/core/SkBlitRow_D32.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitter.cpp b/gfx/skia/skia/src/core/SkBlitter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter.cpp rename to gfx/skia/skia/src/core/SkBlitter.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitter.h b/gfx/skia/skia/src/core/SkBlitter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter.h rename to gfx/skia/skia/src/core/SkBlitter.h diff --git a/gfx/skia/trunk/src/core/SkBlitter_A8.cpp b/gfx/skia/skia/src/core/SkBlitter_A8.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter_A8.cpp rename to gfx/skia/skia/src/core/SkBlitter_A8.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter_ARGB32.cpp rename to gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter_RGB16.cpp rename to gfx/skia/skia/src/core/SkBlitter_RGB16.cpp diff --git a/gfx/skia/trunk/src/core/SkBlitter_Sprite.cpp b/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBlitter_Sprite.cpp rename to gfx/skia/skia/src/core/SkBlitter_Sprite.cpp diff --git a/gfx/skia/trunk/src/core/SkBuffer.cpp b/gfx/skia/skia/src/core/SkBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkBuffer.cpp rename to gfx/skia/skia/src/core/SkBuffer.cpp diff --git a/gfx/skia/trunk/src/core/SkBuffer.h b/gfx/skia/skia/src/core/SkBuffer.h similarity index 100% rename from gfx/skia/trunk/src/core/SkBuffer.h rename to gfx/skia/skia/src/core/SkBuffer.h diff --git a/gfx/skia/trunk/src/core/SkCanvas.cpp b/gfx/skia/skia/src/core/SkCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkCanvas.cpp rename to gfx/skia/skia/src/core/SkCanvas.cpp diff --git a/gfx/skia/trunk/src/core/SkChecksum.h b/gfx/skia/skia/src/core/SkChecksum.h similarity index 100% rename from gfx/skia/trunk/src/core/SkChecksum.h rename to gfx/skia/skia/src/core/SkChecksum.h diff --git a/gfx/skia/trunk/src/core/SkChunkAlloc.cpp b/gfx/skia/skia/src/core/SkChunkAlloc.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkChunkAlloc.cpp rename to gfx/skia/skia/src/core/SkChunkAlloc.cpp diff --git a/gfx/skia/trunk/src/core/SkClipStack.cpp b/gfx/skia/skia/src/core/SkClipStack.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkClipStack.cpp rename to gfx/skia/skia/src/core/SkClipStack.cpp diff --git a/gfx/skia/trunk/src/core/SkColor.cpp b/gfx/skia/skia/src/core/SkColor.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkColor.cpp rename to gfx/skia/skia/src/core/SkColor.cpp diff --git a/gfx/skia/trunk/src/core/SkColorFilter.cpp b/gfx/skia/skia/src/core/SkColorFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkColorFilter.cpp rename to gfx/skia/skia/src/core/SkColorFilter.cpp diff --git a/gfx/skia/trunk/src/core/SkColorTable.cpp b/gfx/skia/skia/src/core/SkColorTable.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkColorTable.cpp rename to gfx/skia/skia/src/core/SkColorTable.cpp diff --git a/gfx/skia/trunk/src/core/SkComposeShader.cpp b/gfx/skia/skia/src/core/SkComposeShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkComposeShader.cpp rename to gfx/skia/skia/src/core/SkComposeShader.cpp diff --git a/gfx/skia/trunk/src/core/SkConfig8888.cpp b/gfx/skia/skia/src/core/SkConfig8888.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkConfig8888.cpp rename to gfx/skia/skia/src/core/SkConfig8888.cpp diff --git a/gfx/skia/trunk/src/core/SkConfig8888.h b/gfx/skia/skia/src/core/SkConfig8888.h similarity index 100% rename from gfx/skia/trunk/src/core/SkConfig8888.h rename to gfx/skia/skia/src/core/SkConfig8888.h diff --git a/gfx/skia/trunk/src/core/SkConvolver.cpp b/gfx/skia/skia/src/core/SkConvolver.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkConvolver.cpp rename to gfx/skia/skia/src/core/SkConvolver.cpp diff --git a/gfx/skia/trunk/src/core/SkConvolver.h b/gfx/skia/skia/src/core/SkConvolver.h similarity index 100% rename from gfx/skia/trunk/src/core/SkConvolver.h rename to gfx/skia/skia/src/core/SkConvolver.h diff --git a/gfx/skia/trunk/src/core/SkCoreBlitters.h b/gfx/skia/skia/src/core/SkCoreBlitters.h similarity index 100% rename from gfx/skia/trunk/src/core/SkCoreBlitters.h rename to gfx/skia/skia/src/core/SkCoreBlitters.h diff --git a/gfx/skia/trunk/src/core/SkCubicClipper.cpp b/gfx/skia/skia/src/core/SkCubicClipper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkCubicClipper.cpp rename to gfx/skia/skia/src/core/SkCubicClipper.cpp diff --git a/gfx/skia/trunk/src/core/SkCubicClipper.h b/gfx/skia/skia/src/core/SkCubicClipper.h similarity index 100% rename from gfx/skia/trunk/src/core/SkCubicClipper.h rename to gfx/skia/skia/src/core/SkCubicClipper.h diff --git a/gfx/skia/trunk/src/core/SkData.cpp b/gfx/skia/skia/src/core/SkData.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkData.cpp rename to gfx/skia/skia/src/core/SkData.cpp diff --git a/gfx/skia/trunk/src/core/SkDataTable.cpp b/gfx/skia/skia/src/core/SkDataTable.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDataTable.cpp rename to gfx/skia/skia/src/core/SkDataTable.cpp diff --git a/gfx/skia/trunk/src/core/SkDebug.cpp b/gfx/skia/skia/src/core/SkDebug.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDebug.cpp rename to gfx/skia/skia/src/core/SkDebug.cpp diff --git a/gfx/skia/trunk/src/core/SkDeque.cpp b/gfx/skia/skia/src/core/SkDeque.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDeque.cpp rename to gfx/skia/skia/src/core/SkDeque.cpp diff --git a/gfx/skia/trunk/src/core/SkDescriptor.h b/gfx/skia/skia/src/core/SkDescriptor.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDescriptor.h rename to gfx/skia/skia/src/core/SkDescriptor.h diff --git a/gfx/skia/trunk/src/core/SkDevice.cpp b/gfx/skia/skia/src/core/SkDevice.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDevice.cpp rename to gfx/skia/skia/src/core/SkDevice.cpp diff --git a/gfx/skia/trunk/src/core/SkDeviceImageFilterProxy.h b/gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDeviceImageFilterProxy.h rename to gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h diff --git a/gfx/skia/trunk/src/core/SkDeviceLooper.cpp b/gfx/skia/skia/src/core/SkDeviceLooper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDeviceLooper.cpp rename to gfx/skia/skia/src/core/SkDeviceLooper.cpp diff --git a/gfx/skia/trunk/src/core/SkDeviceLooper.h b/gfx/skia/skia/src/core/SkDeviceLooper.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDeviceLooper.h rename to gfx/skia/skia/src/core/SkDeviceLooper.h diff --git a/gfx/skia/trunk/src/core/SkDeviceProfile.cpp b/gfx/skia/skia/src/core/SkDeviceProfile.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDeviceProfile.cpp rename to gfx/skia/skia/src/core/SkDeviceProfile.cpp diff --git a/gfx/skia/trunk/src/core/SkDeviceProfile.h b/gfx/skia/skia/src/core/SkDeviceProfile.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDeviceProfile.h rename to gfx/skia/skia/src/core/SkDeviceProfile.h diff --git a/gfx/skia/trunk/src/core/SkDiscardableMemory.h b/gfx/skia/skia/src/core/SkDiscardableMemory.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDiscardableMemory.h rename to gfx/skia/skia/src/core/SkDiscardableMemory.h diff --git a/gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp b/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp rename to gfx/skia/skia/src/core/SkDistanceFieldGen.cpp diff --git a/gfx/skia/trunk/src/core/SkDistanceFieldGen.h b/gfx/skia/skia/src/core/SkDistanceFieldGen.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDistanceFieldGen.h rename to gfx/skia/skia/src/core/SkDistanceFieldGen.h diff --git a/gfx/skia/trunk/src/core/SkDither.cpp b/gfx/skia/skia/src/core/SkDither.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDither.cpp rename to gfx/skia/skia/src/core/SkDither.cpp diff --git a/gfx/skia/trunk/src/core/SkDraw.cpp b/gfx/skia/skia/src/core/SkDraw.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDraw.cpp rename to gfx/skia/skia/src/core/SkDraw.cpp diff --git a/gfx/skia/trunk/src/core/SkDrawLooper.cpp b/gfx/skia/skia/src/core/SkDrawLooper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkDrawLooper.cpp rename to gfx/skia/skia/src/core/SkDrawLooper.cpp diff --git a/gfx/skia/trunk/src/core/SkDrawProcs.h b/gfx/skia/skia/src/core/SkDrawProcs.h similarity index 100% rename from gfx/skia/trunk/src/core/SkDrawProcs.h rename to gfx/skia/skia/src/core/SkDrawProcs.h diff --git a/gfx/skia/trunk/src/core/SkEdge.cpp b/gfx/skia/skia/src/core/SkEdge.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkEdge.cpp rename to gfx/skia/skia/src/core/SkEdge.cpp diff --git a/gfx/skia/trunk/src/core/SkEdge.h b/gfx/skia/skia/src/core/SkEdge.h similarity index 100% rename from gfx/skia/trunk/src/core/SkEdge.h rename to gfx/skia/skia/src/core/SkEdge.h diff --git a/gfx/skia/trunk/src/core/SkEdgeBuilder.cpp b/gfx/skia/skia/src/core/SkEdgeBuilder.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkEdgeBuilder.cpp rename to gfx/skia/skia/src/core/SkEdgeBuilder.cpp diff --git a/gfx/skia/trunk/src/core/SkEdgeBuilder.h b/gfx/skia/skia/src/core/SkEdgeBuilder.h similarity index 100% rename from gfx/skia/trunk/src/core/SkEdgeBuilder.h rename to gfx/skia/skia/src/core/SkEdgeBuilder.h diff --git a/gfx/skia/trunk/src/core/SkEdgeClipper.cpp b/gfx/skia/skia/src/core/SkEdgeClipper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkEdgeClipper.cpp rename to gfx/skia/skia/src/core/SkEdgeClipper.cpp diff --git a/gfx/skia/trunk/src/core/SkEdgeClipper.h b/gfx/skia/skia/src/core/SkEdgeClipper.h similarity index 100% rename from gfx/skia/trunk/src/core/SkEdgeClipper.h rename to gfx/skia/skia/src/core/SkEdgeClipper.h diff --git a/gfx/skia/trunk/src/core/SkEmptyShader.h b/gfx/skia/skia/src/core/SkEmptyShader.h similarity index 100% rename from gfx/skia/trunk/src/core/SkEmptyShader.h rename to gfx/skia/skia/src/core/SkEmptyShader.h diff --git a/gfx/skia/trunk/src/core/SkError.cpp b/gfx/skia/skia/src/core/SkError.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkError.cpp rename to gfx/skia/skia/src/core/SkError.cpp diff --git a/gfx/skia/trunk/src/core/SkErrorInternals.h b/gfx/skia/skia/src/core/SkErrorInternals.h similarity index 100% rename from gfx/skia/trunk/src/core/SkErrorInternals.h rename to gfx/skia/skia/src/core/SkErrorInternals.h diff --git a/gfx/skia/trunk/src/core/SkFDot6.h b/gfx/skia/skia/src/core/SkFDot6.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFDot6.h rename to gfx/skia/skia/src/core/SkFDot6.h diff --git a/gfx/skia/trunk/src/core/SkFilterProc.cpp b/gfx/skia/skia/src/core/SkFilterProc.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFilterProc.cpp rename to gfx/skia/skia/src/core/SkFilterProc.cpp diff --git a/gfx/skia/trunk/src/core/SkFilterProc.h b/gfx/skia/skia/src/core/SkFilterProc.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFilterProc.h rename to gfx/skia/skia/src/core/SkFilterProc.h diff --git a/gfx/skia/trunk/src/core/SkFilterShader.cpp b/gfx/skia/skia/src/core/SkFilterShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFilterShader.cpp rename to gfx/skia/skia/src/core/SkFilterShader.cpp diff --git a/gfx/skia/trunk/src/core/SkFilterShader.h b/gfx/skia/skia/src/core/SkFilterShader.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFilterShader.h rename to gfx/skia/skia/src/core/SkFilterShader.h diff --git a/gfx/skia/trunk/src/core/SkFlate.cpp b/gfx/skia/skia/src/core/SkFlate.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFlate.cpp rename to gfx/skia/skia/src/core/SkFlate.cpp diff --git a/gfx/skia/trunk/src/core/SkFlate.h b/gfx/skia/skia/src/core/SkFlate.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFlate.h rename to gfx/skia/skia/src/core/SkFlate.h diff --git a/gfx/skia/trunk/src/core/SkFlattenable.cpp b/gfx/skia/skia/src/core/SkFlattenable.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFlattenable.cpp rename to gfx/skia/skia/src/core/SkFlattenable.cpp diff --git a/gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp b/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp rename to gfx/skia/skia/src/core/SkFlattenableSerialization.cpp diff --git a/gfx/skia/trunk/src/core/SkFloat.cpp b/gfx/skia/skia/src/core/SkFloat.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFloat.cpp rename to gfx/skia/skia/src/core/SkFloat.cpp diff --git a/gfx/skia/trunk/src/core/SkFloat.h b/gfx/skia/skia/src/core/SkFloat.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFloat.h rename to gfx/skia/skia/src/core/SkFloat.h diff --git a/gfx/skia/trunk/src/core/SkFloatBits.cpp b/gfx/skia/skia/src/core/SkFloatBits.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFloatBits.cpp rename to gfx/skia/skia/src/core/SkFloatBits.cpp diff --git a/gfx/skia/trunk/src/core/SkFont.cpp b/gfx/skia/skia/src/core/SkFont.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFont.cpp rename to gfx/skia/skia/src/core/SkFont.cpp diff --git a/gfx/skia/trunk/src/core/SkFontDescriptor.cpp b/gfx/skia/skia/src/core/SkFontDescriptor.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFontDescriptor.cpp rename to gfx/skia/skia/src/core/SkFontDescriptor.cpp diff --git a/gfx/skia/trunk/src/core/SkFontDescriptor.h b/gfx/skia/skia/src/core/SkFontDescriptor.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFontDescriptor.h rename to gfx/skia/skia/src/core/SkFontDescriptor.h diff --git a/gfx/skia/trunk/src/core/SkFontHost.cpp b/gfx/skia/skia/src/core/SkFontHost.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFontHost.cpp rename to gfx/skia/skia/src/core/SkFontHost.cpp diff --git a/gfx/skia/trunk/src/core/SkFontStream.cpp b/gfx/skia/skia/src/core/SkFontStream.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkFontStream.cpp rename to gfx/skia/skia/src/core/SkFontStream.cpp diff --git a/gfx/skia/trunk/src/core/SkFontStream.h b/gfx/skia/skia/src/core/SkFontStream.h similarity index 100% rename from gfx/skia/trunk/src/core/SkFontStream.h rename to gfx/skia/skia/src/core/SkFontStream.h diff --git a/gfx/skia/trunk/src/core/SkGeometry.cpp b/gfx/skia/skia/src/core/SkGeometry.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkGeometry.cpp rename to gfx/skia/skia/src/core/SkGeometry.cpp diff --git a/gfx/skia/trunk/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeometry.h similarity index 100% rename from gfx/skia/trunk/src/core/SkGeometry.h rename to gfx/skia/skia/src/core/SkGeometry.h diff --git a/gfx/skia/trunk/src/core/SkGlyph.h b/gfx/skia/skia/src/core/SkGlyph.h similarity index 100% rename from gfx/skia/trunk/src/core/SkGlyph.h rename to gfx/skia/skia/src/core/SkGlyph.h diff --git a/gfx/skia/trunk/src/core/SkGlyphCache.cpp b/gfx/skia/skia/src/core/SkGlyphCache.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/core/SkGlyphCache.cpp rename to gfx/skia/skia/src/core/SkGlyphCache.cpp diff --git a/gfx/skia/trunk/src/core/SkGlyphCache.h b/gfx/skia/skia/src/core/SkGlyphCache.h similarity index 100% rename from gfx/skia/trunk/src/core/SkGlyphCache.h rename to gfx/skia/skia/src/core/SkGlyphCache.h diff --git a/gfx/skia/trunk/src/core/SkGlyphCache_Globals.h b/gfx/skia/skia/src/core/SkGlyphCache_Globals.h similarity index 100% rename from gfx/skia/trunk/src/core/SkGlyphCache_Globals.h rename to gfx/skia/skia/src/core/SkGlyphCache_Globals.h diff --git a/gfx/skia/trunk/src/core/SkGraphics.cpp b/gfx/skia/skia/src/core/SkGraphics.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkGraphics.cpp rename to gfx/skia/skia/src/core/SkGraphics.cpp diff --git a/gfx/skia/trunk/src/core/SkImageFilter.cpp b/gfx/skia/skia/src/core/SkImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkImageFilter.cpp rename to gfx/skia/skia/src/core/SkImageFilter.cpp diff --git a/gfx/skia/trunk/src/core/SkImageGenerator.cpp b/gfx/skia/skia/src/core/SkImageGenerator.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkImageGenerator.cpp rename to gfx/skia/skia/src/core/SkImageGenerator.cpp diff --git a/gfx/skia/trunk/src/core/SkImageGeneratorPriv.h b/gfx/skia/skia/src/core/SkImageGeneratorPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkImageGeneratorPriv.h rename to gfx/skia/skia/src/core/SkImageGeneratorPriv.h diff --git a/gfx/skia/trunk/src/core/SkImageInfo.cpp b/gfx/skia/skia/src/core/SkImageInfo.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkImageInfo.cpp rename to gfx/skia/skia/src/core/SkImageInfo.cpp diff --git a/gfx/skia/trunk/src/core/SkInstCnt.cpp b/gfx/skia/skia/src/core/SkInstCnt.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkInstCnt.cpp rename to gfx/skia/skia/src/core/SkInstCnt.cpp diff --git a/gfx/skia/trunk/src/core/SkLazyFnPtr.h b/gfx/skia/skia/src/core/SkLazyFnPtr.h similarity index 100% rename from gfx/skia/trunk/src/core/SkLazyFnPtr.h rename to gfx/skia/skia/src/core/SkLazyFnPtr.h diff --git a/gfx/skia/trunk/src/core/SkLazyPtr.h b/gfx/skia/skia/src/core/SkLazyPtr.h similarity index 100% rename from gfx/skia/trunk/src/core/SkLazyPtr.h rename to gfx/skia/skia/src/core/SkLazyPtr.h diff --git a/gfx/skia/trunk/src/core/SkLineClipper.cpp b/gfx/skia/skia/src/core/SkLineClipper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkLineClipper.cpp rename to gfx/skia/skia/src/core/SkLineClipper.cpp diff --git a/gfx/skia/trunk/src/core/SkLineClipper.h b/gfx/skia/skia/src/core/SkLineClipper.h similarity index 100% rename from gfx/skia/trunk/src/core/SkLineClipper.h rename to gfx/skia/skia/src/core/SkLineClipper.h diff --git a/gfx/skia/trunk/src/core/SkLocalMatrixShader.cpp b/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkLocalMatrixShader.cpp rename to gfx/skia/skia/src/core/SkLocalMatrixShader.cpp diff --git a/gfx/skia/trunk/src/core/SkLocalMatrixShader.h b/gfx/skia/skia/src/core/SkLocalMatrixShader.h similarity index 100% rename from gfx/skia/trunk/src/core/SkLocalMatrixShader.h rename to gfx/skia/skia/src/core/SkLocalMatrixShader.h diff --git a/gfx/skia/trunk/src/core/SkMallocPixelRef.cpp b/gfx/skia/skia/src/core/SkMallocPixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMallocPixelRef.cpp rename to gfx/skia/skia/src/core/SkMallocPixelRef.cpp diff --git a/gfx/skia/trunk/src/core/SkMask.cpp b/gfx/skia/skia/src/core/SkMask.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMask.cpp rename to gfx/skia/skia/src/core/SkMask.cpp diff --git a/gfx/skia/trunk/src/core/SkMaskFilter.cpp b/gfx/skia/skia/src/core/SkMaskFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMaskFilter.cpp rename to gfx/skia/skia/src/core/SkMaskFilter.cpp diff --git a/gfx/skia/trunk/src/core/SkMaskGamma.cpp b/gfx/skia/skia/src/core/SkMaskGamma.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMaskGamma.cpp rename to gfx/skia/skia/src/core/SkMaskGamma.cpp diff --git a/gfx/skia/trunk/src/core/SkMaskGamma.h b/gfx/skia/skia/src/core/SkMaskGamma.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMaskGamma.h rename to gfx/skia/skia/src/core/SkMaskGamma.h diff --git a/gfx/skia/trunk/src/core/SkMath.cpp b/gfx/skia/skia/src/core/SkMath.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMath.cpp rename to gfx/skia/skia/src/core/SkMath.cpp diff --git a/gfx/skia/trunk/src/core/SkMathPriv.h b/gfx/skia/skia/src/core/SkMathPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMathPriv.h rename to gfx/skia/skia/src/core/SkMathPriv.h diff --git a/gfx/skia/trunk/src/core/SkMatrix.cpp b/gfx/skia/skia/src/core/SkMatrix.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMatrix.cpp rename to gfx/skia/skia/src/core/SkMatrix.cpp diff --git a/gfx/skia/trunk/src/core/SkMatrixClipStateMgr.cpp b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMatrixClipStateMgr.cpp rename to gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp diff --git a/gfx/skia/trunk/src/core/SkMatrixClipStateMgr.h b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMatrixClipStateMgr.h rename to gfx/skia/skia/src/core/SkMatrixClipStateMgr.h diff --git a/gfx/skia/trunk/src/core/SkMatrixUtils.h b/gfx/skia/skia/src/core/SkMatrixUtils.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMatrixUtils.h rename to gfx/skia/skia/src/core/SkMatrixUtils.h diff --git a/gfx/skia/trunk/src/core/SkMessageBus.h b/gfx/skia/skia/src/core/SkMessageBus.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMessageBus.h rename to gfx/skia/skia/src/core/SkMessageBus.h diff --git a/gfx/skia/trunk/src/core/SkMetaData.cpp b/gfx/skia/skia/src/core/SkMetaData.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMetaData.cpp rename to gfx/skia/skia/src/core/SkMetaData.cpp diff --git a/gfx/skia/trunk/src/core/SkMipMap.cpp b/gfx/skia/skia/src/core/SkMipMap.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkMipMap.cpp rename to gfx/skia/skia/src/core/SkMipMap.cpp diff --git a/gfx/skia/trunk/src/core/SkMipMap.h b/gfx/skia/skia/src/core/SkMipMap.h similarity index 100% rename from gfx/skia/trunk/src/core/SkMipMap.h rename to gfx/skia/skia/src/core/SkMipMap.h diff --git a/gfx/skia/trunk/src/core/SkOrderedReadBuffer.h b/gfx/skia/skia/src/core/SkOrderedReadBuffer.h similarity index 100% rename from gfx/skia/trunk/src/core/SkOrderedReadBuffer.h rename to gfx/skia/skia/src/core/SkOrderedReadBuffer.h diff --git a/gfx/skia/trunk/src/core/SkPackBits.cpp b/gfx/skia/skia/src/core/SkPackBits.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPackBits.cpp rename to gfx/skia/skia/src/core/SkPackBits.cpp diff --git a/gfx/skia/trunk/src/core/SkPaint.cpp b/gfx/skia/skia/src/core/SkPaint.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPaint.cpp rename to gfx/skia/skia/src/core/SkPaint.cpp diff --git a/gfx/skia/trunk/src/core/SkPaintDefaults.h b/gfx/skia/skia/src/core/SkPaintDefaults.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPaintDefaults.h rename to gfx/skia/skia/src/core/SkPaintDefaults.h diff --git a/gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp b/gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp rename to gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp diff --git a/gfx/skia/trunk/src/core/SkPaintPriv.cpp b/gfx/skia/skia/src/core/SkPaintPriv.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPaintPriv.cpp rename to gfx/skia/skia/src/core/SkPaintPriv.cpp diff --git a/gfx/skia/trunk/src/core/SkPaintPriv.h b/gfx/skia/skia/src/core/SkPaintPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPaintPriv.h rename to gfx/skia/skia/src/core/SkPaintPriv.h diff --git a/gfx/skia/trunk/src/core/SkPatch.cpp b/gfx/skia/skia/src/core/SkPatch.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPatch.cpp rename to gfx/skia/skia/src/core/SkPatch.cpp diff --git a/gfx/skia/trunk/src/core/SkPath.cpp b/gfx/skia/skia/src/core/SkPath.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPath.cpp rename to gfx/skia/skia/src/core/SkPath.cpp diff --git a/gfx/skia/trunk/src/core/SkPathEffect.cpp b/gfx/skia/skia/src/core/SkPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPathEffect.cpp rename to gfx/skia/skia/src/core/SkPathEffect.cpp diff --git a/gfx/skia/trunk/src/core/SkPathHeap.cpp b/gfx/skia/skia/src/core/SkPathHeap.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPathHeap.cpp rename to gfx/skia/skia/src/core/SkPathHeap.cpp diff --git a/gfx/skia/trunk/src/core/SkPathHeap.h b/gfx/skia/skia/src/core/SkPathHeap.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPathHeap.h rename to gfx/skia/skia/src/core/SkPathHeap.h diff --git a/gfx/skia/trunk/src/core/SkPathMeasure.cpp b/gfx/skia/skia/src/core/SkPathMeasure.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPathMeasure.cpp rename to gfx/skia/skia/src/core/SkPathMeasure.cpp diff --git a/gfx/skia/trunk/src/core/SkPathRef.cpp b/gfx/skia/skia/src/core/SkPathRef.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPathRef.cpp rename to gfx/skia/skia/src/core/SkPathRef.cpp diff --git a/gfx/skia/trunk/src/core/SkPerspIter.h b/gfx/skia/skia/src/core/SkPerspIter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPerspIter.h rename to gfx/skia/skia/src/core/SkPerspIter.h diff --git a/gfx/skia/trunk/src/core/SkPicture.cpp b/gfx/skia/skia/src/core/SkPicture.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPicture.cpp rename to gfx/skia/skia/src/core/SkPicture.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureData.cpp b/gfx/skia/skia/src/core/SkPictureData.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureData.cpp rename to gfx/skia/skia/src/core/SkPictureData.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureData.h b/gfx/skia/skia/src/core/SkPictureData.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureData.h rename to gfx/skia/skia/src/core/SkPictureData.h diff --git a/gfx/skia/trunk/src/core/SkPictureFlat.cpp b/gfx/skia/skia/src/core/SkPictureFlat.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureFlat.cpp rename to gfx/skia/skia/src/core/SkPictureFlat.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureFlat.h b/gfx/skia/skia/src/core/SkPictureFlat.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureFlat.h rename to gfx/skia/skia/src/core/SkPictureFlat.h diff --git a/gfx/skia/trunk/src/core/SkPicturePlayback.cpp b/gfx/skia/skia/src/core/SkPicturePlayback.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPicturePlayback.cpp rename to gfx/skia/skia/src/core/SkPicturePlayback.cpp diff --git a/gfx/skia/trunk/src/core/SkPicturePlayback.h b/gfx/skia/skia/src/core/SkPicturePlayback.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPicturePlayback.h rename to gfx/skia/skia/src/core/SkPicturePlayback.h diff --git a/gfx/skia/trunk/src/core/SkPictureRangePlayback.cpp b/gfx/skia/skia/src/core/SkPictureRangePlayback.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureRangePlayback.cpp rename to gfx/skia/skia/src/core/SkPictureRangePlayback.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureRangePlayback.h b/gfx/skia/skia/src/core/SkPictureRangePlayback.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureRangePlayback.h rename to gfx/skia/skia/src/core/SkPictureRangePlayback.h diff --git a/gfx/skia/trunk/src/core/SkPictureRecord.cpp b/gfx/skia/skia/src/core/SkPictureRecord.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureRecord.cpp rename to gfx/skia/skia/src/core/SkPictureRecord.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureRecord.h b/gfx/skia/skia/src/core/SkPictureRecord.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureRecord.h rename to gfx/skia/skia/src/core/SkPictureRecord.h diff --git a/gfx/skia/trunk/src/core/SkPictureRecorder.cpp b/gfx/skia/skia/src/core/SkPictureRecorder.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureRecorder.cpp rename to gfx/skia/skia/src/core/SkPictureRecorder.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureReplacementPlayback.cpp b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureReplacementPlayback.cpp rename to gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureReplacementPlayback.h b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureReplacementPlayback.h rename to gfx/skia/skia/src/core/SkPictureReplacementPlayback.h diff --git a/gfx/skia/trunk/src/core/SkPictureShader.cpp b/gfx/skia/skia/src/core/SkPictureShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureShader.cpp rename to gfx/skia/skia/src/core/SkPictureShader.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureShader.h b/gfx/skia/skia/src/core/SkPictureShader.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureShader.h rename to gfx/skia/skia/src/core/SkPictureShader.h diff --git a/gfx/skia/trunk/src/core/SkPictureStateTree.cpp b/gfx/skia/skia/src/core/SkPictureStateTree.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureStateTree.cpp rename to gfx/skia/skia/src/core/SkPictureStateTree.cpp diff --git a/gfx/skia/trunk/src/core/SkPictureStateTree.h b/gfx/skia/skia/src/core/SkPictureStateTree.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPictureStateTree.h rename to gfx/skia/skia/src/core/SkPictureStateTree.h diff --git a/gfx/skia/trunk/src/core/SkPixelRef.cpp b/gfx/skia/skia/src/core/SkPixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPixelRef.cpp rename to gfx/skia/skia/src/core/SkPixelRef.cpp diff --git a/gfx/skia/trunk/src/core/SkPoint.cpp b/gfx/skia/skia/src/core/SkPoint.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPoint.cpp rename to gfx/skia/skia/src/core/SkPoint.cpp diff --git a/gfx/skia/trunk/src/core/SkProcSpriteBlitter.cpp b/gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkProcSpriteBlitter.cpp rename to gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp diff --git a/gfx/skia/trunk/src/core/SkPtrRecorder.cpp b/gfx/skia/skia/src/core/SkPtrRecorder.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkPtrRecorder.cpp rename to gfx/skia/skia/src/core/SkPtrRecorder.cpp diff --git a/gfx/skia/trunk/src/core/SkPtrRecorder.h b/gfx/skia/skia/src/core/SkPtrRecorder.h similarity index 100% rename from gfx/skia/trunk/src/core/SkPtrRecorder.h rename to gfx/skia/skia/src/core/SkPtrRecorder.h diff --git a/gfx/skia/trunk/src/core/SkQuadClipper.cpp b/gfx/skia/skia/src/core/SkQuadClipper.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkQuadClipper.cpp rename to gfx/skia/skia/src/core/SkQuadClipper.cpp diff --git a/gfx/skia/trunk/src/core/SkQuadClipper.h b/gfx/skia/skia/src/core/SkQuadClipper.h similarity index 100% rename from gfx/skia/trunk/src/core/SkQuadClipper.h rename to gfx/skia/skia/src/core/SkQuadClipper.h diff --git a/gfx/skia/trunk/src/core/SkQuadTree.cpp b/gfx/skia/skia/src/core/SkQuadTree.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkQuadTree.cpp rename to gfx/skia/skia/src/core/SkQuadTree.cpp diff --git a/gfx/skia/trunk/src/core/SkQuadTree.h b/gfx/skia/skia/src/core/SkQuadTree.h similarity index 100% rename from gfx/skia/trunk/src/core/SkQuadTree.h rename to gfx/skia/skia/src/core/SkQuadTree.h diff --git a/gfx/skia/trunk/src/core/SkRRect.cpp b/gfx/skia/skia/src/core/SkRRect.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRRect.cpp rename to gfx/skia/skia/src/core/SkRRect.cpp diff --git a/gfx/skia/trunk/src/core/SkRTree.cpp b/gfx/skia/skia/src/core/SkRTree.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRTree.cpp rename to gfx/skia/skia/src/core/SkRTree.cpp diff --git a/gfx/skia/trunk/src/core/SkRTree.h b/gfx/skia/skia/src/core/SkRTree.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRTree.h rename to gfx/skia/skia/src/core/SkRTree.h diff --git a/gfx/skia/trunk/src/core/SkRasterClip.cpp b/gfx/skia/skia/src/core/SkRasterClip.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRasterClip.cpp rename to gfx/skia/skia/src/core/SkRasterClip.cpp diff --git a/gfx/skia/trunk/src/core/SkRasterClip.h b/gfx/skia/skia/src/core/SkRasterClip.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRasterClip.h rename to gfx/skia/skia/src/core/SkRasterClip.h diff --git a/gfx/skia/trunk/src/core/SkRasterizer.cpp b/gfx/skia/skia/src/core/SkRasterizer.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRasterizer.cpp rename to gfx/skia/skia/src/core/SkRasterizer.cpp diff --git a/gfx/skia/trunk/src/core/SkReadBuffer.cpp b/gfx/skia/skia/src/core/SkReadBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkReadBuffer.cpp rename to gfx/skia/skia/src/core/SkReadBuffer.cpp diff --git a/gfx/skia/trunk/src/core/SkRecord.h b/gfx/skia/skia/src/core/SkRecord.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecord.h rename to gfx/skia/skia/src/core/SkRecord.h diff --git a/gfx/skia/trunk/src/core/SkRecordAnalysis.cpp b/gfx/skia/skia/src/core/SkRecordAnalysis.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordAnalysis.cpp rename to gfx/skia/skia/src/core/SkRecordAnalysis.cpp diff --git a/gfx/skia/trunk/src/core/SkRecordAnalysis.h b/gfx/skia/skia/src/core/SkRecordAnalysis.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordAnalysis.h rename to gfx/skia/skia/src/core/SkRecordAnalysis.h diff --git a/gfx/skia/trunk/src/core/SkRecordDraw.cpp b/gfx/skia/skia/src/core/SkRecordDraw.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordDraw.cpp rename to gfx/skia/skia/src/core/SkRecordDraw.cpp diff --git a/gfx/skia/trunk/src/core/SkRecordDraw.h b/gfx/skia/skia/src/core/SkRecordDraw.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordDraw.h rename to gfx/skia/skia/src/core/SkRecordDraw.h diff --git a/gfx/skia/trunk/src/core/SkRecordOpts.cpp b/gfx/skia/skia/src/core/SkRecordOpts.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordOpts.cpp rename to gfx/skia/skia/src/core/SkRecordOpts.cpp diff --git a/gfx/skia/trunk/src/core/SkRecordOpts.h b/gfx/skia/skia/src/core/SkRecordOpts.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordOpts.h rename to gfx/skia/skia/src/core/SkRecordOpts.h diff --git a/gfx/skia/trunk/src/core/SkRecordPattern.h b/gfx/skia/skia/src/core/SkRecordPattern.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecordPattern.h rename to gfx/skia/skia/src/core/SkRecordPattern.h diff --git a/gfx/skia/trunk/src/core/SkRecorder.cpp b/gfx/skia/skia/src/core/SkRecorder.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRecorder.cpp rename to gfx/skia/skia/src/core/SkRecorder.cpp diff --git a/gfx/skia/trunk/src/core/SkRecorder.h b/gfx/skia/skia/src/core/SkRecorder.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecorder.h rename to gfx/skia/skia/src/core/SkRecorder.h diff --git a/gfx/skia/trunk/src/core/SkRecording.cpp b/gfx/skia/skia/src/core/SkRecording.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRecording.cpp rename to gfx/skia/skia/src/core/SkRecording.cpp diff --git a/gfx/skia/trunk/src/core/SkRecords.h b/gfx/skia/skia/src/core/SkRecords.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRecords.h rename to gfx/skia/skia/src/core/SkRecords.h diff --git a/gfx/skia/trunk/src/core/SkRect.cpp b/gfx/skia/skia/src/core/SkRect.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRect.cpp rename to gfx/skia/skia/src/core/SkRect.cpp diff --git a/gfx/skia/trunk/src/core/SkRefDict.cpp b/gfx/skia/skia/src/core/SkRefDict.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRefDict.cpp rename to gfx/skia/skia/src/core/SkRefDict.cpp diff --git a/gfx/skia/trunk/src/core/SkRefDict.h b/gfx/skia/skia/src/core/SkRefDict.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRefDict.h rename to gfx/skia/skia/src/core/SkRefDict.h diff --git a/gfx/skia/trunk/src/core/SkRegion.cpp b/gfx/skia/skia/src/core/SkRegion.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRegion.cpp rename to gfx/skia/skia/src/core/SkRegion.cpp diff --git a/gfx/skia/trunk/src/core/SkRegionPriv.h b/gfx/skia/skia/src/core/SkRegionPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkRegionPriv.h rename to gfx/skia/skia/src/core/SkRegionPriv.h diff --git a/gfx/skia/trunk/src/core/SkRegion_path.cpp b/gfx/skia/skia/src/core/SkRegion_path.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkRegion_path.cpp rename to gfx/skia/skia/src/core/SkRegion_path.cpp diff --git a/gfx/skia/trunk/src/core/SkSafeMath.h b/gfx/skia/skia/src/core/SkSafeMath.h similarity index 100% rename from gfx/skia/trunk/src/core/SkSafeMath.h rename to gfx/skia/skia/src/core/SkSafeMath.h diff --git a/gfx/skia/trunk/src/core/SkScalar.cpp b/gfx/skia/skia/src/core/SkScalar.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScalar.cpp rename to gfx/skia/skia/src/core/SkScalar.cpp diff --git a/gfx/skia/trunk/src/core/SkScaledImageCache.cpp b/gfx/skia/skia/src/core/SkScaledImageCache.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScaledImageCache.cpp rename to gfx/skia/skia/src/core/SkScaledImageCache.cpp diff --git a/gfx/skia/trunk/src/core/SkScaledImageCache.h b/gfx/skia/skia/src/core/SkScaledImageCache.h similarity index 100% rename from gfx/skia/trunk/src/core/SkScaledImageCache.h rename to gfx/skia/skia/src/core/SkScaledImageCache.h diff --git a/gfx/skia/trunk/src/core/SkScalerContext.cpp b/gfx/skia/skia/src/core/SkScalerContext.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScalerContext.cpp rename to gfx/skia/skia/src/core/SkScalerContext.cpp diff --git a/gfx/skia/trunk/src/core/SkScalerContext.h b/gfx/skia/skia/src/core/SkScalerContext.h similarity index 100% rename from gfx/skia/trunk/src/core/SkScalerContext.h rename to gfx/skia/skia/src/core/SkScalerContext.h diff --git a/gfx/skia/trunk/src/core/SkScan.cpp b/gfx/skia/skia/src/core/SkScan.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScan.cpp rename to gfx/skia/skia/src/core/SkScan.cpp diff --git a/gfx/skia/trunk/src/core/SkScan.h b/gfx/skia/skia/src/core/SkScan.h similarity index 100% rename from gfx/skia/trunk/src/core/SkScan.h rename to gfx/skia/skia/src/core/SkScan.h diff --git a/gfx/skia/trunk/src/core/SkScanPriv.h b/gfx/skia/skia/src/core/SkScanPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkScanPriv.h rename to gfx/skia/skia/src/core/SkScanPriv.h diff --git a/gfx/skia/trunk/src/core/SkScan_AntiPath.cpp b/gfx/skia/skia/src/core/SkScan_AntiPath.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScan_AntiPath.cpp rename to gfx/skia/skia/src/core/SkScan_AntiPath.cpp diff --git a/gfx/skia/trunk/src/core/SkScan_Antihair.cpp b/gfx/skia/skia/src/core/SkScan_Antihair.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScan_Antihair.cpp rename to gfx/skia/skia/src/core/SkScan_Antihair.cpp diff --git a/gfx/skia/trunk/src/core/SkScan_Hairline.cpp b/gfx/skia/skia/src/core/SkScan_Hairline.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScan_Hairline.cpp rename to gfx/skia/skia/src/core/SkScan_Hairline.cpp diff --git a/gfx/skia/trunk/src/core/SkScan_Path.cpp b/gfx/skia/skia/src/core/SkScan_Path.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkScan_Path.cpp rename to gfx/skia/skia/src/core/SkScan_Path.cpp diff --git a/gfx/skia/trunk/src/core/SkShader.cpp b/gfx/skia/skia/src/core/SkShader.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkShader.cpp rename to gfx/skia/skia/src/core/SkShader.cpp diff --git a/gfx/skia/trunk/src/core/SkSinTable.h b/gfx/skia/skia/src/core/SkSinTable.h similarity index 100% rename from gfx/skia/trunk/src/core/SkSinTable.h rename to gfx/skia/skia/src/core/SkSinTable.h diff --git a/gfx/skia/trunk/src/core/SkSmallAllocator.h b/gfx/skia/skia/src/core/SkSmallAllocator.h similarity index 100% rename from gfx/skia/trunk/src/core/SkSmallAllocator.h rename to gfx/skia/skia/src/core/SkSmallAllocator.h diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter.h b/gfx/skia/skia/src/core/SkSpriteBlitter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkSpriteBlitter.h rename to gfx/skia/skia/src/core/SkSpriteBlitter.h diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitterTemplate.h b/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h similarity index 100% rename from gfx/skia/trunk/src/core/SkSpriteBlitterTemplate.h rename to gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkSpriteBlitter_ARGB32.cpp rename to gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkSpriteBlitter_RGB16.cpp rename to gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp diff --git a/gfx/skia/trunk/src/core/SkStream.cpp b/gfx/skia/skia/src/core/SkStream.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkStream.cpp rename to gfx/skia/skia/src/core/SkStream.cpp diff --git a/gfx/skia/trunk/src/core/SkStreamPriv.h b/gfx/skia/skia/src/core/SkStreamPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkStreamPriv.h rename to gfx/skia/skia/src/core/SkStreamPriv.h diff --git a/gfx/skia/trunk/src/core/SkString.cpp b/gfx/skia/skia/src/core/SkString.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkString.cpp rename to gfx/skia/skia/src/core/SkString.cpp diff --git a/gfx/skia/trunk/src/core/SkStringUtils.cpp b/gfx/skia/skia/src/core/SkStringUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkStringUtils.cpp rename to gfx/skia/skia/src/core/SkStringUtils.cpp diff --git a/gfx/skia/trunk/src/core/SkStringUtils.h b/gfx/skia/skia/src/core/SkStringUtils.h similarity index 100% rename from gfx/skia/trunk/src/core/SkStringUtils.h rename to gfx/skia/skia/src/core/SkStringUtils.h diff --git a/gfx/skia/trunk/src/core/SkStroke.cpp b/gfx/skia/skia/src/core/SkStroke.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkStroke.cpp rename to gfx/skia/skia/src/core/SkStroke.cpp diff --git a/gfx/skia/trunk/src/core/SkStroke.h b/gfx/skia/skia/src/core/SkStroke.h similarity index 100% rename from gfx/skia/trunk/src/core/SkStroke.h rename to gfx/skia/skia/src/core/SkStroke.h diff --git a/gfx/skia/trunk/src/core/SkStrokeRec.cpp b/gfx/skia/skia/src/core/SkStrokeRec.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkStrokeRec.cpp rename to gfx/skia/skia/src/core/SkStrokeRec.cpp diff --git a/gfx/skia/trunk/src/core/SkStrokerPriv.cpp b/gfx/skia/skia/src/core/SkStrokerPriv.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkStrokerPriv.cpp rename to gfx/skia/skia/src/core/SkStrokerPriv.cpp diff --git a/gfx/skia/trunk/src/core/SkStrokerPriv.h b/gfx/skia/skia/src/core/SkStrokerPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkStrokerPriv.h rename to gfx/skia/skia/src/core/SkStrokerPriv.h diff --git a/gfx/skia/trunk/src/core/SkTDynamicHash.h b/gfx/skia/skia/src/core/SkTDynamicHash.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTDynamicHash.h rename to gfx/skia/skia/src/core/SkTDynamicHash.h diff --git a/gfx/skia/trunk/src/core/SkTInternalSList.h b/gfx/skia/skia/src/core/SkTInternalSList.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTInternalSList.h rename to gfx/skia/skia/src/core/SkTInternalSList.h diff --git a/gfx/skia/trunk/src/core/SkTLList.h b/gfx/skia/skia/src/core/SkTLList.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTLList.h rename to gfx/skia/skia/src/core/SkTLList.h diff --git a/gfx/skia/trunk/src/core/SkTLS.cpp b/gfx/skia/skia/src/core/SkTLS.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/core/SkTLS.cpp rename to gfx/skia/skia/src/core/SkTLS.cpp diff --git a/gfx/skia/trunk/src/core/SkTLS.h b/gfx/skia/skia/src/core/SkTLS.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTLS.h rename to gfx/skia/skia/src/core/SkTLS.h diff --git a/gfx/skia/trunk/src/core/SkTMultiMap.h b/gfx/skia/skia/src/core/SkTMultiMap.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTMultiMap.h rename to gfx/skia/skia/src/core/SkTMultiMap.h diff --git a/gfx/skia/trunk/src/core/SkTObjectPool.h b/gfx/skia/skia/src/core/SkTObjectPool.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTObjectPool.h rename to gfx/skia/skia/src/core/SkTObjectPool.h diff --git a/gfx/skia/trunk/src/core/SkTRefArray.h b/gfx/skia/skia/src/core/SkTRefArray.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTRefArray.h rename to gfx/skia/skia/src/core/SkTRefArray.h diff --git a/gfx/skia/trunk/src/core/SkTSearch.cpp b/gfx/skia/skia/src/core/SkTSearch.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkTSearch.cpp rename to gfx/skia/skia/src/core/SkTSearch.cpp diff --git a/gfx/skia/trunk/src/core/SkTSort.h b/gfx/skia/skia/src/core/SkTSort.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTSort.h rename to gfx/skia/skia/src/core/SkTSort.h diff --git a/gfx/skia/trunk/src/core/SkTextFormatParams.h b/gfx/skia/skia/src/core/SkTextFormatParams.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTextFormatParams.h rename to gfx/skia/skia/src/core/SkTextFormatParams.h diff --git a/gfx/skia/trunk/src/core/SkTextMapStateProc.h b/gfx/skia/skia/src/core/SkTextMapStateProc.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTextMapStateProc.h rename to gfx/skia/skia/src/core/SkTextMapStateProc.h diff --git a/gfx/skia/trunk/src/core/SkTextToPathIter.h b/gfx/skia/skia/src/core/SkTextToPathIter.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTextToPathIter.h rename to gfx/skia/skia/src/core/SkTextToPathIter.h diff --git a/gfx/skia/trunk/src/core/SkThreadPriv.h b/gfx/skia/skia/src/core/SkThreadPriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkThreadPriv.h rename to gfx/skia/skia/src/core/SkThreadPriv.h diff --git a/gfx/skia/trunk/src/core/SkTileGrid.cpp b/gfx/skia/skia/src/core/SkTileGrid.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkTileGrid.cpp rename to gfx/skia/skia/src/core/SkTileGrid.cpp diff --git a/gfx/skia/trunk/src/core/SkTileGrid.h b/gfx/skia/skia/src/core/SkTileGrid.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTileGrid.h rename to gfx/skia/skia/src/core/SkTileGrid.h diff --git a/gfx/skia/trunk/src/core/SkTraceEvent.h b/gfx/skia/skia/src/core/SkTraceEvent.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTraceEvent.h rename to gfx/skia/skia/src/core/SkTraceEvent.h diff --git a/gfx/skia/trunk/src/core/SkTypeface.cpp b/gfx/skia/skia/src/core/SkTypeface.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkTypeface.cpp rename to gfx/skia/skia/src/core/SkTypeface.cpp diff --git a/gfx/skia/trunk/src/core/SkTypefaceCache.cpp b/gfx/skia/skia/src/core/SkTypefaceCache.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkTypefaceCache.cpp rename to gfx/skia/skia/src/core/SkTypefaceCache.cpp diff --git a/gfx/skia/trunk/src/core/SkTypefaceCache.h b/gfx/skia/skia/src/core/SkTypefaceCache.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTypefaceCache.h rename to gfx/skia/skia/src/core/SkTypefaceCache.h diff --git a/gfx/skia/trunk/src/core/SkTypefacePriv.h b/gfx/skia/skia/src/core/SkTypefacePriv.h similarity index 100% rename from gfx/skia/trunk/src/core/SkTypefacePriv.h rename to gfx/skia/skia/src/core/SkTypefacePriv.h diff --git a/gfx/skia/trunk/src/core/SkUnPreMultiply.cpp b/gfx/skia/skia/src/core/SkUnPreMultiply.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkUnPreMultiply.cpp rename to gfx/skia/skia/src/core/SkUnPreMultiply.cpp diff --git a/gfx/skia/trunk/src/core/SkUtils.cpp b/gfx/skia/skia/src/core/SkUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkUtils.cpp rename to gfx/skia/skia/src/core/SkUtils.cpp diff --git a/gfx/skia/trunk/src/core/SkUtilsArm.cpp b/gfx/skia/skia/src/core/SkUtilsArm.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkUtilsArm.cpp rename to gfx/skia/skia/src/core/SkUtilsArm.cpp diff --git a/gfx/skia/trunk/src/core/SkUtilsArm.h b/gfx/skia/skia/src/core/SkUtilsArm.h similarity index 100% rename from gfx/skia/trunk/src/core/SkUtilsArm.h rename to gfx/skia/skia/src/core/SkUtilsArm.h diff --git a/gfx/skia/trunk/src/core/SkValidatingReadBuffer.cpp b/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkValidatingReadBuffer.cpp rename to gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp diff --git a/gfx/skia/trunk/src/core/SkValidatingReadBuffer.h b/gfx/skia/skia/src/core/SkValidatingReadBuffer.h similarity index 100% rename from gfx/skia/trunk/src/core/SkValidatingReadBuffer.h rename to gfx/skia/skia/src/core/SkValidatingReadBuffer.h diff --git a/gfx/skia/trunk/src/core/SkValidationUtils.h b/gfx/skia/skia/src/core/SkValidationUtils.h similarity index 100% rename from gfx/skia/trunk/src/core/SkValidationUtils.h rename to gfx/skia/skia/src/core/SkValidationUtils.h diff --git a/gfx/skia/trunk/src/core/SkVertState.cpp b/gfx/skia/skia/src/core/SkVertState.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkVertState.cpp rename to gfx/skia/skia/src/core/SkVertState.cpp diff --git a/gfx/skia/trunk/src/core/SkVertState.h b/gfx/skia/skia/src/core/SkVertState.h similarity index 100% rename from gfx/skia/trunk/src/core/SkVertState.h rename to gfx/skia/skia/src/core/SkVertState.h diff --git a/gfx/skia/trunk/src/core/SkWriteBuffer.cpp b/gfx/skia/skia/src/core/SkWriteBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkWriteBuffer.cpp rename to gfx/skia/skia/src/core/SkWriteBuffer.cpp diff --git a/gfx/skia/trunk/src/core/SkWriter32.cpp b/gfx/skia/skia/src/core/SkWriter32.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkWriter32.cpp rename to gfx/skia/skia/src/core/SkWriter32.cpp diff --git a/gfx/skia/trunk/src/core/SkXfermode.cpp b/gfx/skia/skia/src/core/SkXfermode.cpp similarity index 100% rename from gfx/skia/trunk/src/core/SkXfermode.cpp rename to gfx/skia/skia/src/core/SkXfermode.cpp diff --git a/gfx/skia/trunk/src/core/SkXfermode_proccoeff.h b/gfx/skia/skia/src/core/SkXfermode_proccoeff.h similarity index 100% rename from gfx/skia/trunk/src/core/SkXfermode_proccoeff.h rename to gfx/skia/skia/src/core/SkXfermode_proccoeff.h diff --git a/gfx/skia/trunk/src/device/xps/SkXPSDevice.cpp b/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp similarity index 100% rename from gfx/skia/trunk/src/device/xps/SkXPSDevice.cpp rename to gfx/skia/skia/src/device/xps/SkXPSDevice.cpp diff --git a/gfx/skia/trunk/src/doc/SkDocument.cpp b/gfx/skia/skia/src/doc/SkDocument.cpp similarity index 100% rename from gfx/skia/trunk/src/doc/SkDocument.cpp rename to gfx/skia/skia/src/doc/SkDocument.cpp diff --git a/gfx/skia/trunk/src/doc/SkDocument_PDF.cpp b/gfx/skia/skia/src/doc/SkDocument_PDF.cpp similarity index 100% rename from gfx/skia/trunk/src/doc/SkDocument_PDF.cpp rename to gfx/skia/skia/src/doc/SkDocument_PDF.cpp diff --git a/gfx/skia/trunk/src/effects/Sk1DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/Sk1DPathEffect.cpp rename to gfx/skia/skia/src/effects/Sk1DPathEffect.cpp diff --git a/gfx/skia/trunk/src/effects/Sk2DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/Sk2DPathEffect.cpp rename to gfx/skia/skia/src/effects/Sk2DPathEffect.cpp diff --git a/gfx/skia/trunk/src/effects/SkAlphaThresholdFilter.cpp b/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkAlphaThresholdFilter.cpp rename to gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkArithmeticMode.cpp b/gfx/skia/skia/src/effects/SkArithmeticMode.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkArithmeticMode.cpp rename to gfx/skia/skia/src/effects/SkArithmeticMode.cpp diff --git a/gfx/skia/trunk/src/effects/SkAvoidXfermode.cpp b/gfx/skia/skia/src/effects/SkAvoidXfermode.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkAvoidXfermode.cpp rename to gfx/skia/skia/src/effects/SkAvoidXfermode.cpp diff --git a/gfx/skia/trunk/src/effects/SkBitmapSource.cpp b/gfx/skia/skia/src/effects/SkBitmapSource.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkBitmapSource.cpp rename to gfx/skia/skia/src/effects/SkBitmapSource.cpp diff --git a/gfx/skia/trunk/src/effects/SkBlurDrawLooper.cpp b/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkBlurDrawLooper.cpp rename to gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp diff --git a/gfx/skia/trunk/src/effects/SkBlurImageFilter.cpp b/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkBlurImageFilter.cpp rename to gfx/skia/skia/src/effects/SkBlurImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkBlurMask.cpp b/gfx/skia/skia/src/effects/SkBlurMask.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkBlurMask.cpp rename to gfx/skia/skia/src/effects/SkBlurMask.cpp diff --git a/gfx/skia/trunk/src/effects/SkBlurMask.h b/gfx/skia/skia/src/effects/SkBlurMask.h similarity index 100% rename from gfx/skia/trunk/src/effects/SkBlurMask.h rename to gfx/skia/skia/src/effects/SkBlurMask.h diff --git a/gfx/skia/trunk/src/effects/SkBlurMaskFilter.cpp b/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkBlurMaskFilter.cpp rename to gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkColorFilterImageFilter.cpp b/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/effects/SkColorFilterImageFilter.cpp rename to gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkColorFilters.cpp b/gfx/skia/skia/src/effects/SkColorFilters.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkColorFilters.cpp rename to gfx/skia/skia/src/effects/SkColorFilters.cpp diff --git a/gfx/skia/trunk/src/effects/SkColorMatrix.cpp b/gfx/skia/skia/src/effects/SkColorMatrix.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkColorMatrix.cpp rename to gfx/skia/skia/src/effects/SkColorMatrix.cpp diff --git a/gfx/skia/trunk/src/effects/SkColorMatrixFilter.cpp b/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkColorMatrixFilter.cpp rename to gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkComposeImageFilter.cpp b/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkComposeImageFilter.cpp rename to gfx/skia/skia/src/effects/SkComposeImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkCornerPathEffect.cpp b/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkCornerPathEffect.cpp rename to gfx/skia/skia/src/effects/SkCornerPathEffect.cpp diff --git a/gfx/skia/trunk/src/effects/SkDashPathEffect.cpp b/gfx/skia/skia/src/effects/SkDashPathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkDashPathEffect.cpp rename to gfx/skia/skia/src/effects/SkDashPathEffect.cpp diff --git a/gfx/skia/trunk/src/effects/SkDiscretePathEffect.cpp b/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkDiscretePathEffect.cpp rename to gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp diff --git a/gfx/skia/trunk/src/effects/SkDisplacementMapEffect.cpp b/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkDisplacementMapEffect.cpp rename to gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp diff --git a/gfx/skia/trunk/src/effects/SkDropShadowImageFilter.cpp b/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkDropShadowImageFilter.cpp rename to gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask.cpp b/gfx/skia/skia/src/effects/SkEmbossMask.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkEmbossMask.cpp rename to gfx/skia/skia/src/effects/SkEmbossMask.cpp diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask.h b/gfx/skia/skia/src/effects/SkEmbossMask.h similarity index 100% rename from gfx/skia/trunk/src/effects/SkEmbossMask.h rename to gfx/skia/skia/src/effects/SkEmbossMask.h diff --git a/gfx/skia/trunk/src/effects/SkEmbossMaskFilter.cpp b/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkEmbossMaskFilter.cpp rename to gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask_Table.h b/gfx/skia/skia/src/effects/SkEmbossMask_Table.h similarity index 100% rename from gfx/skia/trunk/src/effects/SkEmbossMask_Table.h rename to gfx/skia/skia/src/effects/SkEmbossMask_Table.h diff --git a/gfx/skia/trunk/src/effects/SkGpuBlurUtils.cpp b/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkGpuBlurUtils.cpp rename to gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp diff --git a/gfx/skia/trunk/src/effects/SkGpuBlurUtils.h b/gfx/skia/skia/src/effects/SkGpuBlurUtils.h similarity index 100% rename from gfx/skia/trunk/src/effects/SkGpuBlurUtils.h rename to gfx/skia/skia/src/effects/SkGpuBlurUtils.h diff --git a/gfx/skia/trunk/src/effects/SkLayerDrawLooper.cpp b/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkLayerDrawLooper.cpp rename to gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp diff --git a/gfx/skia/trunk/src/effects/SkLayerRasterizer.cpp b/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkLayerRasterizer.cpp rename to gfx/skia/skia/src/effects/SkLayerRasterizer.cpp diff --git a/gfx/skia/trunk/src/effects/SkLerpXfermode.cpp b/gfx/skia/skia/src/effects/SkLerpXfermode.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkLerpXfermode.cpp rename to gfx/skia/skia/src/effects/SkLerpXfermode.cpp diff --git a/gfx/skia/trunk/src/effects/SkLightingImageFilter.cpp b/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkLightingImageFilter.cpp rename to gfx/skia/skia/src/effects/SkLightingImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkLumaColorFilter.cpp b/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkLumaColorFilter.cpp rename to gfx/skia/skia/src/effects/SkLumaColorFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkMagnifierImageFilter.cpp b/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkMagnifierImageFilter.cpp rename to gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkMatrixConvolutionImageFilter.cpp b/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkMatrixConvolutionImageFilter.cpp rename to gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkMatrixImageFilter.cpp b/gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkMatrixImageFilter.cpp rename to gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkMergeImageFilter.cpp b/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/effects/SkMergeImageFilter.cpp rename to gfx/skia/skia/src/effects/SkMergeImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkMorphologyImageFilter.cpp b/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkMorphologyImageFilter.cpp rename to gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkOffsetImageFilter.cpp b/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkOffsetImageFilter.cpp rename to gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkPaintFlagsDrawFilter.cpp b/gfx/skia/skia/src/effects/SkPaintFlagsDrawFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkPaintFlagsDrawFilter.cpp rename to gfx/skia/skia/src/effects/SkPaintFlagsDrawFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkPerlinNoiseShader.cpp b/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkPerlinNoiseShader.cpp rename to gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp diff --git a/gfx/skia/trunk/src/effects/SkPictureImageFilter.cpp b/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkPictureImageFilter.cpp rename to gfx/skia/skia/src/effects/SkPictureImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkPixelXorXfermode.cpp b/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkPixelXorXfermode.cpp rename to gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp diff --git a/gfx/skia/trunk/src/effects/SkPorterDuff.cpp b/gfx/skia/skia/src/effects/SkPorterDuff.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkPorterDuff.cpp rename to gfx/skia/skia/src/effects/SkPorterDuff.cpp diff --git a/gfx/skia/trunk/src/effects/SkRectShaderImageFilter.cpp b/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkRectShaderImageFilter.cpp rename to gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkStippleMaskFilter.cpp b/gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkStippleMaskFilter.cpp rename to gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkTableColorFilter.cpp b/gfx/skia/skia/src/effects/SkTableColorFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkTableColorFilter.cpp rename to gfx/skia/skia/src/effects/SkTableColorFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkTableMaskFilter.cpp b/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkTableMaskFilter.cpp rename to gfx/skia/skia/src/effects/SkTableMaskFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkTestImageFilters.cpp b/gfx/skia/skia/src/effects/SkTestImageFilters.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/effects/SkTestImageFilters.cpp rename to gfx/skia/skia/src/effects/SkTestImageFilters.cpp diff --git a/gfx/skia/trunk/src/effects/SkTileImageFilter.cpp b/gfx/skia/skia/src/effects/SkTileImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkTileImageFilter.cpp rename to gfx/skia/skia/src/effects/SkTileImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/SkTransparentShader.cpp b/gfx/skia/skia/src/effects/SkTransparentShader.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkTransparentShader.cpp rename to gfx/skia/skia/src/effects/SkTransparentShader.cpp diff --git a/gfx/skia/trunk/src/effects/SkXfermodeImageFilter.cpp b/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/SkXfermodeImageFilter.cpp rename to gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkBitmapCache.cpp b/gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkBitmapCache.cpp rename to gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkBitmapCache.h b/gfx/skia/skia/src/effects/gradients/SkBitmapCache.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkBitmapCache.h rename to gfx/skia/skia/src/effects/gradients/SkBitmapCache.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkClampRange.cpp b/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkClampRange.cpp rename to gfx/skia/skia/src/effects/gradients/SkClampRange.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkClampRange.h b/gfx/skia/skia/src/effects/gradients/SkClampRange.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkClampRange.h rename to gfx/skia/skia/src/effects/gradients/SkClampRange.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkGradientShader.cpp b/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkGradientShader.cpp rename to gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkGradientShaderPriv.h b/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkGradientShaderPriv.h rename to gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkLinearGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkLinearGradient.cpp rename to gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkLinearGradient.h b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkLinearGradient.h rename to gfx/skia/skia/src/effects/gradients/SkLinearGradient.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient.cpp rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient.h rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient_Table.h b/gfx/skia/skia/src/effects/gradients/SkRadialGradient_Table.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient_Table.h rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient_Table.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkSweepGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkSweepGradient.cpp rename to gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkSweepGradient.h b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkSweepGradient.h rename to gfx/skia/skia/src/effects/gradients/SkSweepGradient.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.h rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.h rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp rename to gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h similarity index 100% rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.h rename to gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h diff --git a/gfx/skia/trunk/src/fonts/SkFontMgr_fontconfig.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp similarity index 100% rename from gfx/skia/trunk/src/fonts/SkFontMgr_fontconfig.cpp rename to gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp diff --git a/gfx/skia/trunk/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp similarity index 100% rename from gfx/skia/trunk/src/fonts/SkFontMgr_indirect.cpp rename to gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp diff --git a/gfx/skia/trunk/src/fonts/SkGScalerContext.cpp b/gfx/skia/skia/src/fonts/SkGScalerContext.cpp similarity index 100% rename from gfx/skia/trunk/src/fonts/SkGScalerContext.cpp rename to gfx/skia/skia/src/fonts/SkGScalerContext.cpp diff --git a/gfx/skia/trunk/src/fonts/SkGScalerContext.h b/gfx/skia/skia/src/fonts/SkGScalerContext.h similarity index 100% rename from gfx/skia/trunk/src/fonts/SkGScalerContext.h rename to gfx/skia/skia/src/fonts/SkGScalerContext.h diff --git a/gfx/skia/trunk/src/fonts/SkRemotableFontMgr.cpp b/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp similarity index 100% rename from gfx/skia/trunk/src/fonts/SkRemotableFontMgr.cpp rename to gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp diff --git a/gfx/skia/trunk/src/fonts/SkTestScalerContext.cpp b/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp similarity index 100% rename from gfx/skia/trunk/src/fonts/SkTestScalerContext.cpp rename to gfx/skia/skia/src/fonts/SkTestScalerContext.cpp diff --git a/gfx/skia/trunk/src/fonts/SkTestScalerContext.h b/gfx/skia/skia/src/fonts/SkTestScalerContext.h similarity index 100% rename from gfx/skia/trunk/src/fonts/SkTestScalerContext.h rename to gfx/skia/skia/src/fonts/SkTestScalerContext.h diff --git a/gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.h rename to gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.h b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.h rename to gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrAARectRenderer.cpp b/gfx/skia/skia/src/gpu/GrAARectRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAARectRenderer.cpp rename to gfx/skia/skia/src/gpu/GrAARectRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAARectRenderer.h b/gfx/skia/skia/src/gpu/GrAARectRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAARectRenderer.h rename to gfx/skia/skia/src/gpu/GrAARectRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrAddPathRenderers_default.cpp b/gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAddPathRenderers_default.cpp rename to gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAllocPool.cpp b/gfx/skia/skia/src/gpu/GrAllocPool.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAllocPool.cpp rename to gfx/skia/skia/src/gpu/GrAllocPool.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAllocPool.h b/gfx/skia/skia/src/gpu/GrAllocPool.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAllocPool.h rename to gfx/skia/skia/src/gpu/GrAllocPool.h diff --git a/gfx/skia/trunk/src/gpu/GrAllocator.h b/gfx/skia/skia/src/gpu/GrAllocator.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAllocator.h rename to gfx/skia/skia/src/gpu/GrAllocator.h diff --git a/gfx/skia/trunk/src/gpu/GrAtlas.cpp b/gfx/skia/skia/src/gpu/GrAtlas.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAtlas.cpp rename to gfx/skia/skia/src/gpu/GrAtlas.cpp diff --git a/gfx/skia/trunk/src/gpu/GrAtlas.h b/gfx/skia/skia/src/gpu/GrAtlas.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrAtlas.h rename to gfx/skia/skia/src/gpu/GrAtlas.h diff --git a/gfx/skia/trunk/src/gpu/GrBinHashKey.h b/gfx/skia/skia/src/gpu/GrBinHashKey.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBinHashKey.h rename to gfx/skia/skia/src/gpu/GrBinHashKey.h diff --git a/gfx/skia/trunk/src/gpu/GrBitmapTextContext.cpp b/gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBitmapTextContext.cpp rename to gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp diff --git a/gfx/skia/trunk/src/gpu/GrBitmapTextContext.h b/gfx/skia/skia/src/gpu/GrBitmapTextContext.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBitmapTextContext.h rename to gfx/skia/skia/src/gpu/GrBitmapTextContext.h diff --git a/gfx/skia/trunk/src/gpu/GrBlend.cpp b/gfx/skia/skia/src/gpu/GrBlend.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBlend.cpp rename to gfx/skia/skia/src/gpu/GrBlend.cpp diff --git a/gfx/skia/trunk/src/gpu/GrBlend.h b/gfx/skia/skia/src/gpu/GrBlend.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBlend.h rename to gfx/skia/skia/src/gpu/GrBlend.h diff --git a/gfx/skia/trunk/src/gpu/GrBufferAllocPool.cpp b/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBufferAllocPool.cpp rename to gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp diff --git a/gfx/skia/trunk/src/gpu/GrBufferAllocPool.h b/gfx/skia/skia/src/gpu/GrBufferAllocPool.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrBufferAllocPool.h rename to gfx/skia/skia/src/gpu/GrBufferAllocPool.h diff --git a/gfx/skia/trunk/src/gpu/GrCacheID.cpp b/gfx/skia/skia/src/gpu/GrCacheID.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrCacheID.cpp rename to gfx/skia/skia/src/gpu/GrCacheID.cpp diff --git a/gfx/skia/trunk/src/gpu/GrClipData.cpp b/gfx/skia/skia/src/gpu/GrClipData.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrClipData.cpp rename to gfx/skia/skia/src/gpu/GrClipData.cpp diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskCache.cpp b/gfx/skia/skia/src/gpu/GrClipMaskCache.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrClipMaskCache.cpp rename to gfx/skia/skia/src/gpu/GrClipMaskCache.cpp diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskCache.h b/gfx/skia/skia/src/gpu/GrClipMaskCache.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrClipMaskCache.h rename to gfx/skia/skia/src/gpu/GrClipMaskCache.h diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskManager.cpp b/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrClipMaskManager.cpp rename to gfx/skia/skia/src/gpu/GrClipMaskManager.cpp diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskManager.h b/gfx/skia/skia/src/gpu/GrClipMaskManager.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrClipMaskManager.h rename to gfx/skia/skia/src/gpu/GrClipMaskManager.h diff --git a/gfx/skia/trunk/src/gpu/GrContext.cpp b/gfx/skia/skia/src/gpu/GrContext.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/gpu/GrContext.cpp rename to gfx/skia/skia/src/gpu/GrContext.cpp diff --git a/gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.h b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.h rename to gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.cpp b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.cpp rename to gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp diff --git a/gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.h b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.h rename to gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h diff --git a/gfx/skia/trunk/src/gpu/GrDrawState.cpp b/gfx/skia/skia/src/gpu/GrDrawState.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDrawState.cpp rename to gfx/skia/skia/src/gpu/GrDrawState.cpp diff --git a/gfx/skia/trunk/src/gpu/GrDrawState.h b/gfx/skia/skia/src/gpu/GrDrawState.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDrawState.h rename to gfx/skia/skia/src/gpu/GrDrawState.h diff --git a/gfx/skia/trunk/src/gpu/GrDrawTarget.cpp b/gfx/skia/skia/src/gpu/GrDrawTarget.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDrawTarget.cpp rename to gfx/skia/skia/src/gpu/GrDrawTarget.cpp diff --git a/gfx/skia/trunk/src/gpu/GrDrawTarget.h b/gfx/skia/skia/src/gpu/GrDrawTarget.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDrawTarget.h rename to gfx/skia/skia/src/gpu/GrDrawTarget.h diff --git a/gfx/skia/trunk/src/gpu/GrDrawTargetCaps.h b/gfx/skia/skia/src/gpu/GrDrawTargetCaps.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrDrawTargetCaps.h rename to gfx/skia/skia/src/gpu/GrDrawTargetCaps.h diff --git a/gfx/skia/trunk/src/gpu/GrEffect.cpp b/gfx/skia/skia/src/gpu/GrEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrEffect.cpp rename to gfx/skia/skia/src/gpu/GrEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/GrFontScaler.cpp b/gfx/skia/skia/src/gpu/GrFontScaler.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrFontScaler.cpp rename to gfx/skia/skia/src/gpu/GrFontScaler.cpp diff --git a/gfx/skia/trunk/src/gpu/GrGeometryBuffer.h b/gfx/skia/skia/src/gpu/GrGeometryBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrGeometryBuffer.h rename to gfx/skia/skia/src/gpu/GrGeometryBuffer.h diff --git a/gfx/skia/trunk/src/gpu/GrGpu.cpp b/gfx/skia/skia/src/gpu/GrGpu.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrGpu.cpp rename to gfx/skia/skia/src/gpu/GrGpu.cpp diff --git a/gfx/skia/trunk/src/gpu/GrGpu.h b/gfx/skia/skia/src/gpu/GrGpu.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrGpu.h rename to gfx/skia/skia/src/gpu/GrGpu.h diff --git a/gfx/skia/trunk/src/gpu/GrGpuFactory.cpp b/gfx/skia/skia/src/gpu/GrGpuFactory.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrGpuFactory.cpp rename to gfx/skia/skia/src/gpu/GrGpuFactory.cpp diff --git a/gfx/skia/trunk/src/gpu/GrGpuResource.cpp b/gfx/skia/skia/src/gpu/GrGpuResource.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrGpuResource.cpp rename to gfx/skia/skia/src/gpu/GrGpuResource.cpp diff --git a/gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.cpp b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.cpp rename to gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.h b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.h rename to gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h diff --git a/gfx/skia/trunk/src/gpu/GrIndexBuffer.h b/gfx/skia/skia/src/gpu/GrIndexBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrIndexBuffer.h rename to gfx/skia/skia/src/gpu/GrIndexBuffer.h diff --git a/gfx/skia/trunk/src/gpu/GrLayerCache.cpp b/gfx/skia/skia/src/gpu/GrLayerCache.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrLayerCache.cpp rename to gfx/skia/skia/src/gpu/GrLayerCache.cpp diff --git a/gfx/skia/trunk/src/gpu/GrLayerCache.h b/gfx/skia/skia/src/gpu/GrLayerCache.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrLayerCache.h rename to gfx/skia/skia/src/gpu/GrLayerCache.h diff --git a/gfx/skia/trunk/src/gpu/GrMemoryPool.cpp b/gfx/skia/skia/src/gpu/GrMemoryPool.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrMemoryPool.cpp rename to gfx/skia/skia/src/gpu/GrMemoryPool.cpp diff --git a/gfx/skia/trunk/src/gpu/GrMemoryPool.h b/gfx/skia/skia/src/gpu/GrMemoryPool.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrMemoryPool.h rename to gfx/skia/skia/src/gpu/GrMemoryPool.h diff --git a/gfx/skia/trunk/src/gpu/GrOrderedSet.h b/gfx/skia/skia/src/gpu/GrOrderedSet.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrOrderedSet.h rename to gfx/skia/skia/src/gpu/GrOrderedSet.h diff --git a/gfx/skia/trunk/src/gpu/GrOvalRenderer.cpp b/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrOvalRenderer.cpp rename to gfx/skia/skia/src/gpu/GrOvalRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrOvalRenderer.h b/gfx/skia/skia/src/gpu/GrOvalRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrOvalRenderer.h rename to gfx/skia/skia/src/gpu/GrOvalRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrPaint.cpp b/gfx/skia/skia/src/gpu/GrPaint.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPaint.cpp rename to gfx/skia/skia/src/gpu/GrPaint.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPath.cpp b/gfx/skia/skia/src/gpu/GrPath.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPath.cpp rename to gfx/skia/skia/src/gpu/GrPath.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPath.h b/gfx/skia/skia/src/gpu/GrPath.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPath.h rename to gfx/skia/skia/src/gpu/GrPath.h diff --git a/gfx/skia/trunk/src/gpu/GrPathRange.h b/gfx/skia/skia/src/gpu/GrPathRange.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathRange.h rename to gfx/skia/skia/src/gpu/GrPathRange.h diff --git a/gfx/skia/trunk/src/gpu/GrPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrPathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrPathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPathRenderer.h b/gfx/skia/skia/src/gpu/GrPathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathRenderer.h rename to gfx/skia/skia/src/gpu/GrPathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrPathRendererChain.cpp b/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathRendererChain.cpp rename to gfx/skia/skia/src/gpu/GrPathRendererChain.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPathUtils.cpp b/gfx/skia/skia/src/gpu/GrPathUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathUtils.cpp rename to gfx/skia/skia/src/gpu/GrPathUtils.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPathUtils.h b/gfx/skia/skia/src/gpu/GrPathUtils.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPathUtils.h rename to gfx/skia/skia/src/gpu/GrPathUtils.h diff --git a/gfx/skia/trunk/src/gpu/GrPictureUtils.cpp b/gfx/skia/skia/src/gpu/GrPictureUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPictureUtils.cpp rename to gfx/skia/skia/src/gpu/GrPictureUtils.cpp diff --git a/gfx/skia/trunk/src/gpu/GrPictureUtils.h b/gfx/skia/skia/src/gpu/GrPictureUtils.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPictureUtils.h rename to gfx/skia/skia/src/gpu/GrPictureUtils.h diff --git a/gfx/skia/trunk/src/gpu/GrPlotMgr.h b/gfx/skia/skia/src/gpu/GrPlotMgr.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrPlotMgr.h rename to gfx/skia/skia/src/gpu/GrPlotMgr.h diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer.h b/gfx/skia/skia/src/gpu/GrRectanizer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRectanizer.h rename to gfx/skia/skia/src/gpu/GrRectanizer.h diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_pow2.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRectanizer_pow2.cpp rename to gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_pow2.h b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRectanizer_pow2.h rename to gfx/skia/skia/src/gpu/GrRectanizer_pow2.h diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_skyline.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRectanizer_skyline.cpp rename to gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_skyline.h b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRectanizer_skyline.h rename to gfx/skia/skia/src/gpu/GrRectanizer_skyline.h diff --git a/gfx/skia/trunk/src/gpu/GrRedBlackTree.h b/gfx/skia/skia/src/gpu/GrRedBlackTree.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRedBlackTree.h rename to gfx/skia/skia/src/gpu/GrRedBlackTree.h diff --git a/gfx/skia/trunk/src/gpu/GrReducedClip.cpp b/gfx/skia/skia/src/gpu/GrReducedClip.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrReducedClip.cpp rename to gfx/skia/skia/src/gpu/GrReducedClip.cpp diff --git a/gfx/skia/trunk/src/gpu/GrReducedClip.h b/gfx/skia/skia/src/gpu/GrReducedClip.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrReducedClip.h rename to gfx/skia/skia/src/gpu/GrReducedClip.h diff --git a/gfx/skia/trunk/src/gpu/GrRenderTarget.cpp b/gfx/skia/skia/src/gpu/GrRenderTarget.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrRenderTarget.cpp rename to gfx/skia/skia/src/gpu/GrRenderTarget.cpp diff --git a/gfx/skia/trunk/src/gpu/GrResourceCache.cpp b/gfx/skia/skia/src/gpu/GrResourceCache.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrResourceCache.cpp rename to gfx/skia/skia/src/gpu/GrResourceCache.cpp diff --git a/gfx/skia/trunk/src/gpu/GrResourceCache.h b/gfx/skia/skia/src/gpu/GrResourceCache.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrResourceCache.h rename to gfx/skia/skia/src/gpu/GrResourceCache.h diff --git a/gfx/skia/trunk/src/gpu/GrSWMaskHelper.cpp b/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrSWMaskHelper.cpp rename to gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp diff --git a/gfx/skia/trunk/src/gpu/GrSWMaskHelper.h b/gfx/skia/skia/src/gpu/GrSWMaskHelper.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrSWMaskHelper.h rename to gfx/skia/skia/src/gpu/GrSWMaskHelper.h diff --git a/gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.h b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.h rename to gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrStencil.cpp b/gfx/skia/skia/src/gpu/GrStencil.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencil.cpp rename to gfx/skia/skia/src/gpu/GrStencil.cpp diff --git a/gfx/skia/trunk/src/gpu/GrStencil.h b/gfx/skia/skia/src/gpu/GrStencil.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencil.h rename to gfx/skia/skia/src/gpu/GrStencil.h diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp rename to gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.h rename to gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.cpp rename to gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.h rename to gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h diff --git a/gfx/skia/trunk/src/gpu/GrStencilBuffer.cpp b/gfx/skia/skia/src/gpu/GrStencilBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilBuffer.cpp rename to gfx/skia/skia/src/gpu/GrStencilBuffer.cpp diff --git a/gfx/skia/trunk/src/gpu/GrStencilBuffer.h b/gfx/skia/skia/src/gpu/GrStencilBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStencilBuffer.h rename to gfx/skia/skia/src/gpu/GrStencilBuffer.h diff --git a/gfx/skia/trunk/src/gpu/GrStrokeInfo.h b/gfx/skia/skia/src/gpu/GrStrokeInfo.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrStrokeInfo.h rename to gfx/skia/skia/src/gpu/GrStrokeInfo.h diff --git a/gfx/skia/trunk/src/gpu/GrSurface.cpp b/gfx/skia/skia/src/gpu/GrSurface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrSurface.cpp rename to gfx/skia/skia/src/gpu/GrSurface.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTBSearch.h b/gfx/skia/skia/src/gpu/GrTBSearch.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTBSearch.h rename to gfx/skia/skia/src/gpu/GrTBSearch.h diff --git a/gfx/skia/trunk/src/gpu/GrTHashTable.h b/gfx/skia/skia/src/gpu/GrTHashTable.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTHashTable.h rename to gfx/skia/skia/src/gpu/GrTHashTable.h diff --git a/gfx/skia/trunk/src/gpu/GrTemplates.h b/gfx/skia/skia/src/gpu/GrTemplates.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTemplates.h rename to gfx/skia/skia/src/gpu/GrTemplates.h diff --git a/gfx/skia/trunk/src/gpu/GrTest.cpp b/gfx/skia/skia/src/gpu/GrTest.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTest.cpp rename to gfx/skia/skia/src/gpu/GrTest.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTest.h b/gfx/skia/skia/src/gpu/GrTest.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTest.h rename to gfx/skia/skia/src/gpu/GrTest.h diff --git a/gfx/skia/trunk/src/gpu/GrTextContext.cpp b/gfx/skia/skia/src/gpu/GrTextContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextContext.cpp rename to gfx/skia/skia/src/gpu/GrTextContext.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTextContext.h b/gfx/skia/skia/src/gpu/GrTextContext.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextContext.h rename to gfx/skia/skia/src/gpu/GrTextContext.h diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike.cpp b/gfx/skia/skia/src/gpu/GrTextStrike.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextStrike.cpp rename to gfx/skia/skia/src/gpu/GrTextStrike.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike.h b/gfx/skia/skia/src/gpu/GrTextStrike.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextStrike.h rename to gfx/skia/skia/src/gpu/GrTextStrike.h diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike_impl.h b/gfx/skia/skia/src/gpu/GrTextStrike_impl.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextStrike_impl.h rename to gfx/skia/skia/src/gpu/GrTextStrike_impl.h diff --git a/gfx/skia/trunk/src/gpu/GrTexture.cpp b/gfx/skia/skia/src/gpu/GrTexture.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTexture.cpp rename to gfx/skia/skia/src/gpu/GrTexture.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTextureAccess.cpp b/gfx/skia/skia/src/gpu/GrTextureAccess.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTextureAccess.cpp rename to gfx/skia/skia/src/gpu/GrTextureAccess.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTraceMarker.cpp b/gfx/skia/skia/src/gpu/GrTraceMarker.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTraceMarker.cpp rename to gfx/skia/skia/src/gpu/GrTraceMarker.cpp diff --git a/gfx/skia/trunk/src/gpu/GrTraceMarker.h b/gfx/skia/skia/src/gpu/GrTraceMarker.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTraceMarker.h rename to gfx/skia/skia/src/gpu/GrTraceMarker.h diff --git a/gfx/skia/trunk/src/gpu/GrTracing.h b/gfx/skia/skia/src/gpu/GrTracing.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrTracing.h rename to gfx/skia/skia/src/gpu/GrTracing.h diff --git a/gfx/skia/trunk/src/gpu/GrVertexBuffer.h b/gfx/skia/skia/src/gpu/GrVertexBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/GrVertexBuffer.h rename to gfx/skia/skia/src/gpu/GrVertexBuffer.h diff --git a/gfx/skia/trunk/src/gpu/SkGpuDevice.cpp b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/SkGpuDevice.cpp rename to gfx/skia/skia/src/gpu/SkGpuDevice.cpp diff --git a/gfx/skia/trunk/src/gpu/SkGr.cpp b/gfx/skia/skia/src/gpu/SkGr.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/SkGr.cpp rename to gfx/skia/skia/src/gpu/SkGr.cpp diff --git a/gfx/skia/trunk/src/gpu/SkGrPixelRef.cpp b/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/SkGrPixelRef.cpp rename to gfx/skia/skia/src/gpu/SkGrPixelRef.cpp diff --git a/gfx/skia/trunk/src/gpu/SkGrTexturePixelRef.cpp b/gfx/skia/skia/src/gpu/SkGrTexturePixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/SkGrTexturePixelRef.cpp rename to gfx/skia/skia/src/gpu/SkGrTexturePixelRef.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/Gr1DKernelEffect.h b/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/Gr1DKernelEffect.h rename to gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrBezierEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrBezierEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrBezierEffect.h b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrBezierEffect.h rename to gfx/skia/skia/src/gpu/effects/GrBezierEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.h b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.h rename to gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.h rename to gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.h rename to gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.h rename to gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.h rename to gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrDashingEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDashingEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrDashingEffect.h b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDashingEffect.h rename to gfx/skia/skia/src/gpu/effects/GrDashingEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.h rename to gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrDitherEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDitherEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrDitherEffect.h b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrDitherEffect.h rename to gfx/skia/skia/src/gpu/effects/GrDitherEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.h rename to gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrOvalEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrOvalEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrOvalEffect.h b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrOvalEffect.h rename to gfx/skia/skia/src/gpu/effects/GrOvalEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h rename to gfx/skia/skia/src/gpu/effects/GrRRectEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.h rename to gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.h rename to gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureDomain.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrTextureDomain.cpp rename to gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureDomain.h b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrTextureDomain.h rename to gfx/skia/skia/src/gpu/effects/GrTextureDomain.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.cpp rename to gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.h b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.h rename to gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrVertexEffect.h b/gfx/skia/skia/src/gpu/effects/GrVertexEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrVertexEffect.h rename to gfx/skia/skia/src/gpu/effects/GrVertexEffect.h diff --git a/gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp rename to gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp diff --git a/gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.h b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.h rename to gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleGLESInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleGLESInterface.h rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.h rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.cpp b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.h b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.h rename to gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLCaps.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h b/gfx/skia/skia/src/gpu/gl/GrGLCaps.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLCaps.h rename to gfx/skia/skia/src/gpu/gl/GrGLCaps.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLContext.cpp b/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLContext.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLContext.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLContext.h b/gfx/skia/skia/src/gpu/gl/GrGLContext.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLContext.h rename to gfx/skia/skia/src/gpu/gl/GrGLContext.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCreateNullInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLCreateNullInterface.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_native.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_native.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_none.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefines.h b/gfx/skia/skia/src/gpu/gl/GrGLDefines.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLDefines.h rename to gfx/skia/skia/src/gpu/gl/GrGLDefines.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLEffect.h rename to gfx/skia/skia/src/gpu/gl/GrGLEffect.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLExtensions.cpp b/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLExtensions.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIRect.h b/gfx/skia/skia/src/gpu/gl/GrGLIRect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLIRect.h rename to gfx/skia/skia/src/gpu/gl/GrGLIRect.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.h rename to gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLInterface.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.h b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.h rename to gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.h rename to gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPath.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLPath.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLPath.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPath.h b/gfx/skia/skia/src/gpu/gl/GrGLPath.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLPath.h rename to gfx/skia/skia/src/gpu/gl/GrGLPath.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPathRange.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLPathRange.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPathRange.h b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLPathRange.h rename to gfx/skia/skia/src/gpu/gl/GrGLPathRange.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgram.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgram.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgram.h b/gfx/skia/skia/src/gpu/gl/GrGLProgram.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgram.h rename to gfx/skia/skia/src/gpu/gl/GrGLProgram.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.h rename to gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.h rename to gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.cpp b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.h b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.h rename to gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL.cpp b/gfx/skia/skia/src/gpu/gl/GrGLSL.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLSL.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLSL.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL.h b/gfx/skia/skia/src/gpu/gl/GrGLSL.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLSL.h rename to gfx/skia/skia/src/gpu/gl/GrGLSL.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL_impl.h b/gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLSL_impl.h rename to gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.cpp b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.h b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.h rename to gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderVar.h b/gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderVar.h rename to gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.h rename to gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLTexture.cpp b/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLTexture.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLTexture.h b/gfx/skia/skia/src/gpu/gl/GrGLTexture.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLTexture.h rename to gfx/skia/skia/src/gpu/gl/GrGLTexture.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformHandle.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformHandle.h rename to gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.h rename to gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUtil.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLUtil.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUtil.h b/gfx/skia/skia/src/gpu/gl/GrGLUtil.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLUtil.h rename to gfx/skia/skia/src/gpu/gl/GrGLUtil.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.h rename to gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.cpp rename to gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.h rename to gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexEffect.h rename to gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL.cpp rename to gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL.h b/gfx/skia/skia/src/gpu/gl/GrGpuGL.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL.h rename to gfx/skia/skia/src/gpu/gl/GrGpuGL.h diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL_program.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL_program.cpp rename to gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/SkGLContextHelper.cpp b/gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/SkGLContextHelper.cpp rename to gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/SkNullGLContext.cpp b/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/SkNullGLContext.cpp rename to gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp b/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp rename to gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/android/SkNativeGLContext_android.cpp b/gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/android/SkNativeGLContext_android.cpp rename to gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp rename to gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/angle/SkANGLEGLContext.cpp b/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/angle/SkANGLEGLContext.cpp rename to gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.h b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.h rename to gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFBBindableObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFBBindableObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrFBBindableObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrFBBindableObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFakeRefObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrFakeRefObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrRenderBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrRenderBufferObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrVertexArrayObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrVertexArrayObj.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/GrVertexArrayObj.h rename to gfx/skia/skia/src/gpu/gl/debug/GrVertexArrayObj.h diff --git a/gfx/skia/trunk/src/gpu/gl/debug/SkDebugGLContext.cpp b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/debug/SkDebugGLContext.cpp rename to gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp rename to gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm b/gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm rename to gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm diff --git a/gfx/skia/trunk/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp rename to gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/mac/SkNativeGLContext_mac.cpp rename to gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp b/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp rename to gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/SkMesaGLContext.cpp b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/mesa/SkMesaGLContext.cpp rename to gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/osmesa_wrapper.h b/gfx/skia/skia/src/gpu/gl/mesa/osmesa_wrapper.h similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/mesa/osmesa_wrapper.h rename to gfx/skia/skia/src/gpu/gl/mesa/osmesa_wrapper.h diff --git a/gfx/skia/trunk/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp b/gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp rename to gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp b/gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp rename to gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/unix/SkNativeGLContext_unix.cpp b/gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/unix/SkNativeGLContext_unix.cpp rename to gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp rename to gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp diff --git a/gfx/skia/trunk/src/gpu/gl/win/SkNativeGLContext_win.cpp b/gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp similarity index 100% rename from gfx/skia/trunk/src/gpu/gl/win/SkNativeGLContext_win.cpp rename to gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp diff --git a/gfx/skia/trunk/src/image/SkImage.cpp b/gfx/skia/skia/src/image/SkImage.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkImage.cpp rename to gfx/skia/skia/src/image/SkImage.cpp diff --git a/gfx/skia/trunk/src/image/SkImagePriv.cpp b/gfx/skia/skia/src/image/SkImagePriv.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkImagePriv.cpp rename to gfx/skia/skia/src/image/SkImagePriv.cpp diff --git a/gfx/skia/trunk/src/image/SkImagePriv.h b/gfx/skia/skia/src/image/SkImagePriv.h similarity index 100% rename from gfx/skia/trunk/src/image/SkImagePriv.h rename to gfx/skia/skia/src/image/SkImagePriv.h diff --git a/gfx/skia/trunk/src/image/SkImage_Base.h b/gfx/skia/skia/src/image/SkImage_Base.h similarity index 100% rename from gfx/skia/trunk/src/image/SkImage_Base.h rename to gfx/skia/skia/src/image/SkImage_Base.h diff --git a/gfx/skia/trunk/src/image/SkImage_Codec.cpp b/gfx/skia/skia/src/image/SkImage_Codec.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkImage_Codec.cpp rename to gfx/skia/skia/src/image/SkImage_Codec.cpp diff --git a/gfx/skia/trunk/src/image/SkImage_Gpu.cpp b/gfx/skia/skia/src/image/SkImage_Gpu.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkImage_Gpu.cpp rename to gfx/skia/skia/src/image/SkImage_Gpu.cpp diff --git a/gfx/skia/trunk/src/image/SkImage_Raster.cpp b/gfx/skia/skia/src/image/SkImage_Raster.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkImage_Raster.cpp rename to gfx/skia/skia/src/image/SkImage_Raster.cpp diff --git a/gfx/skia/trunk/src/image/SkSurface.cpp b/gfx/skia/skia/src/image/SkSurface.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkSurface.cpp rename to gfx/skia/skia/src/image/SkSurface.cpp diff --git a/gfx/skia/trunk/src/image/SkSurface_Base.h b/gfx/skia/skia/src/image/SkSurface_Base.h similarity index 100% rename from gfx/skia/trunk/src/image/SkSurface_Base.h rename to gfx/skia/skia/src/image/SkSurface_Base.h diff --git a/gfx/skia/trunk/src/image/SkSurface_Gpu.cpp b/gfx/skia/skia/src/image/SkSurface_Gpu.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkSurface_Gpu.cpp rename to gfx/skia/skia/src/image/SkSurface_Gpu.cpp diff --git a/gfx/skia/trunk/src/image/SkSurface_Raster.cpp b/gfx/skia/skia/src/image/SkSurface_Raster.cpp similarity index 100% rename from gfx/skia/trunk/src/image/SkSurface_Raster.cpp rename to gfx/skia/skia/src/image/SkSurface_Raster.cpp diff --git a/gfx/skia/trunk/src/images/SkDecodingImageGenerator.cpp b/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkDecodingImageGenerator.cpp rename to gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp diff --git a/gfx/skia/trunk/src/images/SkForceLinking.cpp b/gfx/skia/skia/src/images/SkForceLinking.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkForceLinking.cpp rename to gfx/skia/skia/src/images/SkForceLinking.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder.cpp b/gfx/skia/skia/src/images/SkImageDecoder.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder.cpp rename to gfx/skia/skia/src/images/SkImageDecoder.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_FactoryDefault.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_FactoryDefault.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_FactoryRegistrar.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_FactoryRegistrar.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_ktx.cpp b/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_ktx.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libbmp.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libgif.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libgif.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libico.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libico.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libico.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libjpeg.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libjpeg.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libpng.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libpng.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libwebp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_libwebp.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_pkm.cpp b/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_pkm.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_wbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageDecoder_wbmp.cpp rename to gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp diff --git a/gfx/skia/trunk/src/images/SkImageEncoder.cpp b/gfx/skia/skia/src/images/SkImageEncoder.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageEncoder.cpp rename to gfx/skia/skia/src/images/SkImageEncoder.cpp diff --git a/gfx/skia/trunk/src/images/SkImageEncoder_Factory.cpp b/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageEncoder_Factory.cpp rename to gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp diff --git a/gfx/skia/trunk/src/images/SkImageEncoder_argb.cpp b/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkImageEncoder_argb.cpp rename to gfx/skia/skia/src/images/SkImageEncoder_argb.cpp diff --git a/gfx/skia/trunk/src/images/SkJpegUtility.cpp b/gfx/skia/skia/src/images/SkJpegUtility.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkJpegUtility.cpp rename to gfx/skia/skia/src/images/SkJpegUtility.cpp diff --git a/gfx/skia/trunk/src/images/SkJpegUtility.h b/gfx/skia/skia/src/images/SkJpegUtility.h similarity index 100% rename from gfx/skia/trunk/src/images/SkJpegUtility.h rename to gfx/skia/skia/src/images/SkJpegUtility.h diff --git a/gfx/skia/trunk/src/images/SkMovie.cpp b/gfx/skia/skia/src/images/SkMovie.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkMovie.cpp rename to gfx/skia/skia/src/images/SkMovie.cpp diff --git a/gfx/skia/trunk/src/images/SkMovie_gif.cpp b/gfx/skia/skia/src/images/SkMovie_gif.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkMovie_gif.cpp rename to gfx/skia/skia/src/images/SkMovie_gif.cpp diff --git a/gfx/skia/trunk/src/images/SkPageFlipper.cpp b/gfx/skia/skia/src/images/SkPageFlipper.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkPageFlipper.cpp rename to gfx/skia/skia/src/images/SkPageFlipper.cpp diff --git a/gfx/skia/trunk/src/images/SkScaledBitmapSampler.cpp b/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp similarity index 100% rename from gfx/skia/trunk/src/images/SkScaledBitmapSampler.cpp rename to gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp diff --git a/gfx/skia/trunk/src/images/SkScaledBitmapSampler.h b/gfx/skia/skia/src/images/SkScaledBitmapSampler.h similarity index 100% rename from gfx/skia/trunk/src/images/SkScaledBitmapSampler.h rename to gfx/skia/skia/src/images/SkScaledBitmapSampler.h diff --git a/gfx/skia/trunk/src/images/bmpdecoderhelper.cpp b/gfx/skia/skia/src/images/bmpdecoderhelper.cpp similarity index 100% rename from gfx/skia/trunk/src/images/bmpdecoderhelper.cpp rename to gfx/skia/skia/src/images/bmpdecoderhelper.cpp diff --git a/gfx/skia/trunk/src/images/bmpdecoderhelper.h b/gfx/skia/skia/src/images/bmpdecoderhelper.h similarity index 100% rename from gfx/skia/trunk/src/images/bmpdecoderhelper.h rename to gfx/skia/skia/src/images/bmpdecoderhelper.h diff --git a/gfx/skia/trunk/src/images/transform_scanline.h b/gfx/skia/skia/src/images/transform_scanline.h similarity index 100% rename from gfx/skia/trunk/src/images/transform_scanline.h rename to gfx/skia/skia/src/images/transform_scanline.h diff --git a/gfx/skia/trunk/src/lazy/SkCachingPixelRef.cpp b/gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/lazy/SkCachingPixelRef.cpp rename to gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp diff --git a/gfx/skia/trunk/src/lazy/SkCachingPixelRef.h b/gfx/skia/skia/src/lazy/SkCachingPixelRef.h similarity index 100% rename from gfx/skia/trunk/src/lazy/SkCachingPixelRef.h rename to gfx/skia/skia/src/lazy/SkCachingPixelRef.h diff --git a/gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.cpp b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp similarity index 100% rename from gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.cpp rename to gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp diff --git a/gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.h b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h similarity index 100% rename from gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.h rename to gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h diff --git a/gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.cpp b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp similarity index 100% rename from gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.cpp rename to gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp diff --git a/gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.h b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h similarity index 100% rename from gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.h rename to gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_arm_neon.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_filter_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_filter_neon.h rename to gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_neon.h rename to gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.h rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_mips_dsp.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_none.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_none.cpp rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.cpp rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.h rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_none.cpp rename to gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4.h rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_asm.S rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.cpp rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.h rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_mips_dsp.cpp rename to gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_none.cpp rename to gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts.h b/gfx/skia/skia/src/opts/SkBlurImage_opts.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts.h rename to gfx/skia/skia/src/opts/SkBlurImage_opts.h diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.cpp rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.h rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.cpp rename to gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.h rename to gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_none.cpp rename to gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h b/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkColor_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkColor_opts_neon.h b/gfx/skia/skia/src/opts/SkColor_opts_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkColor_opts_neon.h rename to gfx/skia/skia/src/opts/SkColor_opts_neon.h diff --git a/gfx/skia/trunk/src/opts/SkMath_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMath_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkMath_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkMath_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts.h b/gfx/skia/skia/src/opts/SkMorphology_opts.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts.h rename to gfx/skia/skia/src/opts/SkMorphology_opts.h diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_arm.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_neon.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_neon.cpp rename to gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_neon.h b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_neon.h rename to gfx/skia/skia/src/opts/SkMorphology_opts_neon.h diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_none.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkMorphology_opts_none.cpp rename to gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts.h rename to gfx/skia/skia/src/opts/SkTextureCompression_opts.h diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_arm.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.cpp rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.h rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_none.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_none.cpp rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.h b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_arm.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkUtils_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_none.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkUtils_opts_none.cpp rename to gfx/skia/skia/src/opts/SkUtils_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.cpp rename to gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.h b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.h rename to gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm.cpp rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.cpp rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.h rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_none.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/SkXfermode_opts_none.cpp rename to gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp diff --git a/gfx/skia/trunk/src/opts/memset.arm.S b/gfx/skia/skia/src/opts/memset.arm.S similarity index 100% rename from gfx/skia/trunk/src/opts/memset.arm.S rename to gfx/skia/skia/src/opts/memset.arm.S diff --git a/gfx/skia/trunk/src/opts/memset16_neon.S b/gfx/skia/skia/src/opts/memset16_neon.S similarity index 100% rename from gfx/skia/trunk/src/opts/memset16_neon.S rename to gfx/skia/skia/src/opts/memset16_neon.S diff --git a/gfx/skia/trunk/src/opts/memset32_neon.S b/gfx/skia/skia/src/opts/memset32_neon.S similarity index 100% rename from gfx/skia/trunk/src/opts/memset32_neon.S rename to gfx/skia/skia/src/opts/memset32_neon.S diff --git a/gfx/skia/trunk/src/opts/opts_check_x86.cpp b/gfx/skia/skia/src/opts/opts_check_x86.cpp similarity index 100% rename from gfx/skia/trunk/src/opts/opts_check_x86.cpp rename to gfx/skia/skia/src/opts/opts_check_x86.cpp diff --git a/gfx/skia/trunk/src/pathops/SkAddIntersections.cpp b/gfx/skia/skia/src/pathops/SkAddIntersections.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkAddIntersections.cpp rename to gfx/skia/skia/src/pathops/SkAddIntersections.cpp diff --git a/gfx/skia/trunk/src/pathops/SkAddIntersections.h b/gfx/skia/skia/src/pathops/SkAddIntersections.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkAddIntersections.h rename to gfx/skia/skia/src/pathops/SkAddIntersections.h diff --git a/gfx/skia/trunk/src/pathops/SkDCubicIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDCubicIntersection.cpp rename to gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDCubicLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDCubicLineIntersection.cpp rename to gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDCubicToQuads.cpp b/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDCubicToQuads.cpp rename to gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDLineIntersection.cpp rename to gfx/skia/skia/src/pathops/SkDLineIntersection.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDQuadImplicit.cpp b/gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDQuadImplicit.cpp rename to gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDQuadImplicit.h b/gfx/skia/skia/src/pathops/SkDQuadImplicit.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDQuadImplicit.h rename to gfx/skia/skia/src/pathops/SkDQuadImplicit.h diff --git a/gfx/skia/trunk/src/pathops/SkDQuadIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDQuadIntersection.cpp rename to gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp diff --git a/gfx/skia/trunk/src/pathops/SkDQuadLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkDQuadLineIntersection.cpp rename to gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp diff --git a/gfx/skia/trunk/src/pathops/SkIntersectionHelper.h b/gfx/skia/skia/src/pathops/SkIntersectionHelper.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkIntersectionHelper.h rename to gfx/skia/skia/src/pathops/SkIntersectionHelper.h diff --git a/gfx/skia/trunk/src/pathops/SkIntersections.cpp b/gfx/skia/skia/src/pathops/SkIntersections.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkIntersections.cpp rename to gfx/skia/skia/src/pathops/SkIntersections.cpp diff --git a/gfx/skia/trunk/src/pathops/SkIntersections.h b/gfx/skia/skia/src/pathops/SkIntersections.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkIntersections.h rename to gfx/skia/skia/src/pathops/SkIntersections.h diff --git a/gfx/skia/trunk/src/pathops/SkLineParameters.h b/gfx/skia/skia/src/pathops/SkLineParameters.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkLineParameters.h rename to gfx/skia/skia/src/pathops/SkLineParameters.h diff --git a/gfx/skia/trunk/src/pathops/SkOpAngle.cpp b/gfx/skia/skia/src/pathops/SkOpAngle.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpAngle.cpp rename to gfx/skia/skia/src/pathops/SkOpAngle.cpp diff --git a/gfx/skia/trunk/src/pathops/SkOpAngle.h b/gfx/skia/skia/src/pathops/SkOpAngle.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpAngle.h rename to gfx/skia/skia/src/pathops/SkOpAngle.h diff --git a/gfx/skia/trunk/src/pathops/SkOpContour.cpp b/gfx/skia/skia/src/pathops/SkOpContour.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpContour.cpp rename to gfx/skia/skia/src/pathops/SkOpContour.cpp diff --git a/gfx/skia/trunk/src/pathops/SkOpContour.h b/gfx/skia/skia/src/pathops/SkOpContour.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpContour.h rename to gfx/skia/skia/src/pathops/SkOpContour.h diff --git a/gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.cpp b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.cpp rename to gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp diff --git a/gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.h b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.h rename to gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h diff --git a/gfx/skia/trunk/src/pathops/SkOpSegment.cpp b/gfx/skia/skia/src/pathops/SkOpSegment.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpSegment.cpp rename to gfx/skia/skia/src/pathops/SkOpSegment.cpp diff --git a/gfx/skia/trunk/src/pathops/SkOpSegment.h b/gfx/skia/skia/src/pathops/SkOpSegment.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpSegment.h rename to gfx/skia/skia/src/pathops/SkOpSegment.h diff --git a/gfx/skia/trunk/src/pathops/SkOpSpan.h b/gfx/skia/skia/src/pathops/SkOpSpan.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkOpSpan.h rename to gfx/skia/skia/src/pathops/SkOpSpan.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsBounds.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsBounds.h b/gfx/skia/skia/src/pathops/SkPathOpsBounds.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsBounds.h rename to gfx/skia/skia/src/pathops/SkPathOpsBounds.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCommon.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsCommon.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCommon.h b/gfx/skia/skia/src/pathops/SkPathOpsCommon.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsCommon.h rename to gfx/skia/skia/src/pathops/SkPathOpsCommon.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCubic.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsCubic.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCubic.h b/gfx/skia/skia/src/pathops/SkPathOpsCubic.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsCubic.h rename to gfx/skia/skia/src/pathops/SkPathOpsCubic.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCurve.h b/gfx/skia/skia/src/pathops/SkPathOpsCurve.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsCurve.h rename to gfx/skia/skia/src/pathops/SkPathOpsCurve.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsDebug.cpp b/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsDebug.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsDebug.h b/gfx/skia/skia/src/pathops/SkPathOpsDebug.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsDebug.h rename to gfx/skia/skia/src/pathops/SkPathOpsDebug.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsLine.cpp b/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsLine.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsLine.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsLine.h b/gfx/skia/skia/src/pathops/SkPathOpsLine.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsLine.h rename to gfx/skia/skia/src/pathops/SkPathOpsLine.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsOp.cpp b/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsOp.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsOp.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsPoint.cpp b/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsPoint.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsPoint.h b/gfx/skia/skia/src/pathops/SkPathOpsPoint.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsPoint.h rename to gfx/skia/skia/src/pathops/SkPathOpsPoint.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsQuad.cpp b/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsQuad.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsQuad.h b/gfx/skia/skia/src/pathops/SkPathOpsQuad.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsQuad.h rename to gfx/skia/skia/src/pathops/SkPathOpsQuad.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsRect.cpp b/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsRect.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsRect.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsRect.h b/gfx/skia/skia/src/pathops/SkPathOpsRect.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsRect.h rename to gfx/skia/skia/src/pathops/SkPathOpsRect.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsSimplify.cpp b/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsSimplify.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTightBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsTightBounds.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTriangle.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsTriangle.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTriangle.h b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsTriangle.h rename to gfx/skia/skia/src/pathops/SkPathOpsTriangle.h diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTypes.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsTypes.cpp rename to gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTypes.h b/gfx/skia/skia/src/pathops/SkPathOpsTypes.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathOpsTypes.h rename to gfx/skia/skia/src/pathops/SkPathOpsTypes.h diff --git a/gfx/skia/trunk/src/pathops/SkPathWriter.cpp b/gfx/skia/skia/src/pathops/SkPathWriter.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathWriter.cpp rename to gfx/skia/skia/src/pathops/SkPathWriter.cpp diff --git a/gfx/skia/trunk/src/pathops/SkPathWriter.h b/gfx/skia/skia/src/pathops/SkPathWriter.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkPathWriter.h rename to gfx/skia/skia/src/pathops/SkPathWriter.h diff --git a/gfx/skia/trunk/src/pathops/SkQuarticRoot.cpp b/gfx/skia/skia/src/pathops/SkQuarticRoot.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkQuarticRoot.cpp rename to gfx/skia/skia/src/pathops/SkQuarticRoot.cpp diff --git a/gfx/skia/trunk/src/pathops/SkQuarticRoot.h b/gfx/skia/skia/src/pathops/SkQuarticRoot.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkQuarticRoot.h rename to gfx/skia/skia/src/pathops/SkQuarticRoot.h diff --git a/gfx/skia/trunk/src/pathops/SkReduceOrder.cpp b/gfx/skia/skia/src/pathops/SkReduceOrder.cpp similarity index 100% rename from gfx/skia/trunk/src/pathops/SkReduceOrder.cpp rename to gfx/skia/skia/src/pathops/SkReduceOrder.cpp diff --git a/gfx/skia/trunk/src/pathops/SkReduceOrder.h b/gfx/skia/skia/src/pathops/SkReduceOrder.h similarity index 100% rename from gfx/skia/trunk/src/pathops/SkReduceOrder.h rename to gfx/skia/skia/src/pathops/SkReduceOrder.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFCatalog.cpp b/gfx/skia/skia/src/pdf/SkPDFCatalog.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFCatalog.cpp rename to gfx/skia/skia/src/pdf/SkPDFCatalog.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFCatalog.h b/gfx/skia/skia/src/pdf/SkPDFCatalog.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFCatalog.h rename to gfx/skia/skia/src/pdf/SkPDFCatalog.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFDevice.cpp b/gfx/skia/skia/src/pdf/SkPDFDevice.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFDevice.cpp rename to gfx/skia/skia/src/pdf/SkPDFDevice.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.cpp b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.cpp rename to gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.h b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.h rename to gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFDocument.cpp b/gfx/skia/skia/src/pdf/SkPDFDocument.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFDocument.cpp rename to gfx/skia/skia/src/pdf/SkPDFDocument.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFFont.cpp b/gfx/skia/skia/src/pdf/SkPDFFont.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFFont.cpp rename to gfx/skia/skia/src/pdf/SkPDFFont.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFFont.h b/gfx/skia/skia/src/pdf/SkPDFFont.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFFont.h rename to gfx/skia/skia/src/pdf/SkPDFFont.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFFontImpl.h b/gfx/skia/skia/src/pdf/SkPDFFontImpl.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFFontImpl.h rename to gfx/skia/skia/src/pdf/SkPDFFontImpl.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFFormXObject.cpp b/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFFormXObject.cpp rename to gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFFormXObject.h b/gfx/skia/skia/src/pdf/SkPDFFormXObject.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFFormXObject.h rename to gfx/skia/skia/src/pdf/SkPDFFormXObject.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFGraphicState.cpp b/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFGraphicState.cpp rename to gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFGraphicState.h b/gfx/skia/skia/src/pdf/SkPDFGraphicState.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFGraphicState.h rename to gfx/skia/skia/src/pdf/SkPDFGraphicState.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFImage.cpp b/gfx/skia/skia/src/pdf/SkPDFImage.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFImage.cpp rename to gfx/skia/skia/src/pdf/SkPDFImage.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFImage.h b/gfx/skia/skia/src/pdf/SkPDFImage.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFImage.h rename to gfx/skia/skia/src/pdf/SkPDFImage.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFPage.cpp b/gfx/skia/skia/src/pdf/SkPDFPage.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFPage.cpp rename to gfx/skia/skia/src/pdf/SkPDFPage.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFPage.h b/gfx/skia/skia/src/pdf/SkPDFPage.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFPage.h rename to gfx/skia/skia/src/pdf/SkPDFPage.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFResourceDict.cpp b/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFResourceDict.cpp rename to gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFResourceDict.h b/gfx/skia/skia/src/pdf/SkPDFResourceDict.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFResourceDict.h rename to gfx/skia/skia/src/pdf/SkPDFResourceDict.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFShader.cpp b/gfx/skia/skia/src/pdf/SkPDFShader.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFShader.cpp rename to gfx/skia/skia/src/pdf/SkPDFShader.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFShader.h b/gfx/skia/skia/src/pdf/SkPDFShader.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFShader.h rename to gfx/skia/skia/src/pdf/SkPDFShader.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFStream.cpp b/gfx/skia/skia/src/pdf/SkPDFStream.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFStream.cpp rename to gfx/skia/skia/src/pdf/SkPDFStream.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFStream.h b/gfx/skia/skia/src/pdf/SkPDFStream.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFStream.h rename to gfx/skia/skia/src/pdf/SkPDFStream.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFTypes.cpp b/gfx/skia/skia/src/pdf/SkPDFTypes.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFTypes.cpp rename to gfx/skia/skia/src/pdf/SkPDFTypes.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFTypes.h b/gfx/skia/skia/src/pdf/SkPDFTypes.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFTypes.h rename to gfx/skia/skia/src/pdf/SkPDFTypes.h diff --git a/gfx/skia/trunk/src/pdf/SkPDFUtils.cpp b/gfx/skia/skia/src/pdf/SkPDFUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFUtils.cpp rename to gfx/skia/skia/src/pdf/SkPDFUtils.cpp diff --git a/gfx/skia/trunk/src/pdf/SkPDFUtils.h b/gfx/skia/skia/src/pdf/SkPDFUtils.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkPDFUtils.h rename to gfx/skia/skia/src/pdf/SkPDFUtils.h diff --git a/gfx/skia/trunk/src/pdf/SkTSet.h b/gfx/skia/skia/src/pdf/SkTSet.h similarity index 100% rename from gfx/skia/trunk/src/pdf/SkTSet.h rename to gfx/skia/skia/src/pdf/SkTSet.h diff --git a/gfx/skia/trunk/src/pipe/SkGPipePriv.h b/gfx/skia/skia/src/pipe/SkGPipePriv.h similarity index 100% rename from gfx/skia/trunk/src/pipe/SkGPipePriv.h rename to gfx/skia/skia/src/pipe/SkGPipePriv.h diff --git a/gfx/skia/trunk/src/pipe/SkGPipeRead.cpp b/gfx/skia/skia/src/pipe/SkGPipeRead.cpp similarity index 100% rename from gfx/skia/trunk/src/pipe/SkGPipeRead.cpp rename to gfx/skia/skia/src/pipe/SkGPipeRead.cpp diff --git a/gfx/skia/trunk/src/pipe/SkGPipeWrite.cpp b/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp similarity index 100% rename from gfx/skia/trunk/src/pipe/SkGPipeWrite.cpp rename to gfx/skia/skia/src/pipe/SkGPipeWrite.cpp diff --git a/gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.cpp b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp similarity index 100% rename from gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.cpp rename to gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp diff --git a/gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.h b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h similarity index 100% rename from gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.h rename to gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h diff --git a/gfx/skia/trunk/src/ports/SkAtomics_sync.h b/gfx/skia/skia/src/ports/SkAtomics_sync.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkAtomics_sync.h rename to gfx/skia/skia/src/ports/SkAtomics_sync.h diff --git a/gfx/skia/trunk/src/ports/SkAtomics_win.h b/gfx/skia/skia/src/ports/SkAtomics_win.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkAtomics_win.h rename to gfx/skia/skia/src/ports/SkAtomics_win.h diff --git a/gfx/skia/trunk/src/ports/SkBarriers_arm.h b/gfx/skia/skia/src/ports/SkBarriers_arm.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkBarriers_arm.h rename to gfx/skia/skia/src/ports/SkBarriers_arm.h diff --git a/gfx/skia/trunk/src/ports/SkBarriers_tsan.h b/gfx/skia/skia/src/ports/SkBarriers_tsan.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkBarriers_tsan.h rename to gfx/skia/skia/src/ports/SkBarriers_tsan.h diff --git a/gfx/skia/trunk/src/ports/SkBarriers_x86.h b/gfx/skia/skia/src/ports/SkBarriers_x86.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkBarriers_x86.h rename to gfx/skia/skia/src/ports/SkBarriers_x86.h diff --git a/gfx/skia/trunk/src/ports/SkDebug_android.cpp b/gfx/skia/skia/src/ports/SkDebug_android.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkDebug_android.cpp rename to gfx/skia/skia/src/ports/SkDebug_android.cpp diff --git a/gfx/skia/trunk/src/ports/SkDebug_nacl.cpp b/gfx/skia/skia/src/ports/SkDebug_nacl.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkDebug_nacl.cpp rename to gfx/skia/skia/src/ports/SkDebug_nacl.cpp diff --git a/gfx/skia/trunk/src/ports/SkDebug_stdio.cpp b/gfx/skia/skia/src/ports/SkDebug_stdio.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkDebug_stdio.cpp rename to gfx/skia/skia/src/ports/SkDebug_stdio.cpp diff --git a/gfx/skia/trunk/src/ports/SkDebug_win.cpp b/gfx/skia/skia/src/ports/SkDebug_win.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkDebug_win.cpp rename to gfx/skia/skia/src/ports/SkDebug_win.cpp diff --git a/gfx/skia/trunk/src/ports/SkDiscardableMemory_none.cpp b/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkDiscardableMemory_none.cpp rename to gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontConfigInterface_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontConfigInterface_android.cpp rename to gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontConfigInterface_direct.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontConfigInterface_direct.cpp rename to gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontConfigParser_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontConfigParser_android.cpp rename to gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontConfigParser_android.h b/gfx/skia/skia/src/ports/SkFontConfigParser_android.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontConfigParser_android.h rename to gfx/skia/skia/src/ports/SkFontConfigParser_android.h diff --git a/gfx/skia/trunk/src/ports/SkFontConfigTypeface.h b/gfx/skia/skia/src/ports/SkFontConfigTypeface.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontConfigTypeface.h rename to gfx/skia/skia/src/ports/SkFontConfigTypeface.h diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp rename to gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.cpp rename to gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.h b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.h rename to gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h diff --git a/gfx/skia/trunk/src/ports/SkFontHost_android_old.cpp b/gfx/skia/skia/src/ports/SkFontHost_android_old.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_android_old.cpp rename to gfx/skia/skia/src/ports/SkFontHost_android_old.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_cairo.cpp b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_cairo.cpp rename to gfx/skia/skia/src/ports/SkFontHost_cairo.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_fontconfig.cpp b/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_fontconfig.cpp rename to gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_linux.cpp b/gfx/skia/skia/src/ports/SkFontHost_linux.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_linux.cpp rename to gfx/skia/skia/src/ports/SkFontHost_linux.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_mac.cpp b/gfx/skia/skia/src/ports/SkFontHost_mac.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_mac.cpp rename to gfx/skia/skia/src/ports/SkFontHost_mac.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_none.cpp b/gfx/skia/skia/src/ports/SkFontHost_none.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_none.cpp rename to gfx/skia/skia/src/ports/SkFontHost_none.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontHost_win.cpp b/gfx/skia/skia/src/ports/SkFontHost_win.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontHost_win.cpp rename to gfx/skia/skia/src/ports/SkFontHost_win.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_android.cpp b/gfx/skia/skia/src/ports/SkFontMgr_android.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontMgr_android.cpp rename to gfx/skia/skia/src/ports/SkFontMgr_android.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_default_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontMgr_default_dw.cpp rename to gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_default_gdi.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontMgr_default_gdi.cpp rename to gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkFontMgr_win_dw.cpp rename to gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp diff --git a/gfx/skia/trunk/src/ports/SkGlobalInitialization_chromium.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkGlobalInitialization_chromium.cpp rename to gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp diff --git a/gfx/skia/trunk/src/ports/SkGlobalInitialization_default.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkGlobalInitialization_default.cpp rename to gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_CG.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkImageDecoder_CG.cpp rename to gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_WIC.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkImageDecoder_WIC.cpp rename to gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_empty.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkImageDecoder_empty.cpp rename to gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp diff --git a/gfx/skia/trunk/src/ports/SkMemory_malloc.cpp b/gfx/skia/skia/src/ports/SkMemory_malloc.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkMemory_malloc.cpp rename to gfx/skia/skia/src/ports/SkMemory_malloc.cpp diff --git a/gfx/skia/trunk/src/ports/SkMemory_mozalloc.cpp b/gfx/skia/skia/src/ports/SkMemory_mozalloc.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkMemory_mozalloc.cpp rename to gfx/skia/skia/src/ports/SkMemory_mozalloc.cpp diff --git a/gfx/skia/trunk/src/ports/SkMutex_pthread.h b/gfx/skia/skia/src/ports/SkMutex_pthread.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkMutex_pthread.h rename to gfx/skia/skia/src/ports/SkMutex_pthread.h diff --git a/gfx/skia/trunk/src/ports/SkMutex_win.h b/gfx/skia/skia/src/ports/SkMutex_win.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkMutex_win.h rename to gfx/skia/skia/src/ports/SkMutex_win.h diff --git a/gfx/skia/trunk/src/ports/SkOSFile_none.cpp b/gfx/skia/skia/src/ports/SkOSFile_none.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkOSFile_none.cpp rename to gfx/skia/skia/src/ports/SkOSFile_none.cpp diff --git a/gfx/skia/trunk/src/ports/SkOSFile_posix.cpp b/gfx/skia/skia/src/ports/SkOSFile_posix.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkOSFile_posix.cpp rename to gfx/skia/skia/src/ports/SkOSFile_posix.cpp diff --git a/gfx/skia/trunk/src/ports/SkOSFile_stdio.cpp b/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkOSFile_stdio.cpp rename to gfx/skia/skia/src/ports/SkOSFile_stdio.cpp diff --git a/gfx/skia/trunk/src/ports/SkOSFile_win.cpp b/gfx/skia/skia/src/ports/SkOSFile_win.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkOSFile_win.cpp rename to gfx/skia/skia/src/ports/SkOSFile_win.cpp diff --git a/gfx/skia/trunk/src/ports/SkRemotableFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkRemotableFontMgr_win_dw.cpp rename to gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp diff --git a/gfx/skia/trunk/src/ports/SkScalerContext_win_dw.cpp b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkScalerContext_win_dw.cpp rename to gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp diff --git a/gfx/skia/trunk/src/ports/SkScalerContext_win_dw.h b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkScalerContext_win_dw.h rename to gfx/skia/skia/src/ports/SkScalerContext_win_dw.h diff --git a/gfx/skia/trunk/src/ports/SkTLS_none.cpp b/gfx/skia/skia/src/ports/SkTLS_none.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTLS_none.cpp rename to gfx/skia/skia/src/ports/SkTLS_none.cpp diff --git a/gfx/skia/trunk/src/ports/SkTLS_pthread.cpp b/gfx/skia/skia/src/ports/SkTLS_pthread.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTLS_pthread.cpp rename to gfx/skia/skia/src/ports/SkTLS_pthread.cpp diff --git a/gfx/skia/trunk/src/ports/SkTLS_win.cpp b/gfx/skia/skia/src/ports/SkTLS_win.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTLS_win.cpp rename to gfx/skia/skia/src/ports/SkTLS_win.cpp diff --git a/gfx/skia/trunk/src/ports/SkTime_Unix.cpp b/gfx/skia/skia/src/ports/SkTime_Unix.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTime_Unix.cpp rename to gfx/skia/skia/src/ports/SkTime_Unix.cpp diff --git a/gfx/skia/trunk/src/ports/SkTime_win.cpp b/gfx/skia/skia/src/ports/SkTime_win.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTime_win.cpp rename to gfx/skia/skia/src/ports/SkTime_win.cpp diff --git a/gfx/skia/trunk/src/ports/SkTypeface_win_dw.cpp b/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkTypeface_win_dw.cpp rename to gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp diff --git a/gfx/skia/trunk/src/ports/SkTypeface_win_dw.h b/gfx/skia/skia/src/ports/SkTypeface_win_dw.h similarity index 100% rename from gfx/skia/trunk/src/ports/SkTypeface_win_dw.h rename to gfx/skia/skia/src/ports/SkTypeface_win_dw.h diff --git a/gfx/skia/trunk/src/ports/SkXMLParser_empty.cpp b/gfx/skia/skia/src/ports/SkXMLParser_empty.cpp similarity index 100% rename from gfx/skia/trunk/src/ports/SkXMLParser_empty.cpp rename to gfx/skia/skia/src/ports/SkXMLParser_empty.cpp diff --git a/gfx/skia/trunk/src/sfnt/SkIBMFamilyClass.h b/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkIBMFamilyClass.h rename to gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTableTypes.h b/gfx/skia/skia/src/sfnt/SkOTTableTypes.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTableTypes.h rename to gfx/skia/skia/src/sfnt/SkOTTableTypes.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBDT.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBDT.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBDT.h rename to gfx/skia/skia/src/sfnt/SkOTTable_EBDT.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBLC.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBLC.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBLC.h rename to gfx/skia/skia/src/sfnt/SkOTTable_EBLC.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBSC.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBSC.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBSC.h rename to gfx/skia/skia/src/sfnt/SkOTTable_EBSC.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V0.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V0.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V1.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V1.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V2.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V3.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V3.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V4.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V4.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_VA.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_VA.h rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_gasp.h b/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_gasp.h rename to gfx/skia/skia/src/sfnt/SkOTTable_gasp.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_glyf.h b/gfx/skia/skia/src/sfnt/SkOTTable_glyf.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_glyf.h rename to gfx/skia/skia/src/sfnt/SkOTTable_glyf.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_head.h b/gfx/skia/skia/src/sfnt/SkOTTable_head.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_head.h rename to gfx/skia/skia/src/sfnt/SkOTTable_head.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_hhea.h b/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_hhea.h rename to gfx/skia/skia/src/sfnt/SkOTTable_hhea.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_loca.h b/gfx/skia/skia/src/sfnt/SkOTTable_loca.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_loca.h rename to gfx/skia/skia/src/sfnt/SkOTTable_loca.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp.h rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp_CFF.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp_CFF.h rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp_TT.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp_TT.h rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_name.cpp b/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_name.cpp rename to gfx/skia/skia/src/sfnt/SkOTTable_name.cpp diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_name.h b/gfx/skia/skia/src/sfnt/SkOTTable_name.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_name.h rename to gfx/skia/skia/src/sfnt/SkOTTable_name.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_post.h b/gfx/skia/skia/src/sfnt/SkOTTable_post.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTTable_post.h rename to gfx/skia/skia/src/sfnt/SkOTTable_post.h diff --git a/gfx/skia/trunk/src/sfnt/SkOTUtils.cpp b/gfx/skia/skia/src/sfnt/SkOTUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTUtils.cpp rename to gfx/skia/skia/src/sfnt/SkOTUtils.cpp diff --git a/gfx/skia/trunk/src/sfnt/SkOTUtils.h b/gfx/skia/skia/src/sfnt/SkOTUtils.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkOTUtils.h rename to gfx/skia/skia/src/sfnt/SkOTUtils.h diff --git a/gfx/skia/trunk/src/sfnt/SkPanose.h b/gfx/skia/skia/src/sfnt/SkPanose.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkPanose.h rename to gfx/skia/skia/src/sfnt/SkPanose.h diff --git a/gfx/skia/trunk/src/sfnt/SkPreprocessorSeq.h b/gfx/skia/skia/src/sfnt/SkPreprocessorSeq.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkPreprocessorSeq.h rename to gfx/skia/skia/src/sfnt/SkPreprocessorSeq.h diff --git a/gfx/skia/trunk/src/sfnt/SkSFNTHeader.h b/gfx/skia/skia/src/sfnt/SkSFNTHeader.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkSFNTHeader.h rename to gfx/skia/skia/src/sfnt/SkSFNTHeader.h diff --git a/gfx/skia/trunk/src/sfnt/SkTTCFHeader.h b/gfx/skia/skia/src/sfnt/SkTTCFHeader.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkTTCFHeader.h rename to gfx/skia/skia/src/sfnt/SkTTCFHeader.h diff --git a/gfx/skia/trunk/src/sfnt/SkTypedEnum.h b/gfx/skia/skia/src/sfnt/SkTypedEnum.h similarity index 100% rename from gfx/skia/trunk/src/sfnt/SkTypedEnum.h rename to gfx/skia/skia/src/sfnt/SkTypedEnum.h diff --git a/gfx/skia/trunk/src/svg/SkSVG.cpp b/gfx/skia/skia/src/svg/SkSVG.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVG.cpp rename to gfx/skia/skia/src/svg/SkSVG.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGCircle.cpp b/gfx/skia/skia/src/svg/SkSVGCircle.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGCircle.cpp rename to gfx/skia/skia/src/svg/SkSVGCircle.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGCircle.h b/gfx/skia/skia/src/svg/SkSVGCircle.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGCircle.h rename to gfx/skia/skia/src/svg/SkSVGCircle.h diff --git a/gfx/skia/trunk/src/svg/SkSVGClipPath.cpp b/gfx/skia/skia/src/svg/SkSVGClipPath.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGClipPath.cpp rename to gfx/skia/skia/src/svg/SkSVGClipPath.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGClipPath.h b/gfx/skia/skia/src/svg/SkSVGClipPath.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGClipPath.h rename to gfx/skia/skia/src/svg/SkSVGClipPath.h diff --git a/gfx/skia/trunk/src/svg/SkSVGDefs.cpp b/gfx/skia/skia/src/svg/SkSVGDefs.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGDefs.cpp rename to gfx/skia/skia/src/svg/SkSVGDefs.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGDefs.h b/gfx/skia/skia/src/svg/SkSVGDefs.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGDefs.h rename to gfx/skia/skia/src/svg/SkSVGDefs.h diff --git a/gfx/skia/trunk/src/svg/SkSVGElements.cpp b/gfx/skia/skia/src/svg/SkSVGElements.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGElements.cpp rename to gfx/skia/skia/src/svg/SkSVGElements.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGElements.h b/gfx/skia/skia/src/svg/SkSVGElements.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGElements.h rename to gfx/skia/skia/src/svg/SkSVGElements.h diff --git a/gfx/skia/trunk/src/svg/SkSVGEllipse.cpp b/gfx/skia/skia/src/svg/SkSVGEllipse.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGEllipse.cpp rename to gfx/skia/skia/src/svg/SkSVGEllipse.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGEllipse.h b/gfx/skia/skia/src/svg/SkSVGEllipse.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGEllipse.h rename to gfx/skia/skia/src/svg/SkSVGEllipse.h diff --git a/gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.cpp b/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.cpp rename to gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.h b/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.h rename to gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h diff --git a/gfx/skia/trunk/src/svg/SkSVGFilter.cpp b/gfx/skia/skia/src/svg/SkSVGFilter.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGFilter.cpp rename to gfx/skia/skia/src/svg/SkSVGFilter.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGFilter.h b/gfx/skia/skia/src/svg/SkSVGFilter.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGFilter.h rename to gfx/skia/skia/src/svg/SkSVGFilter.h diff --git a/gfx/skia/trunk/src/svg/SkSVGG.cpp b/gfx/skia/skia/src/svg/SkSVGG.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGG.cpp rename to gfx/skia/skia/src/svg/SkSVGG.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGG.h b/gfx/skia/skia/src/svg/SkSVGG.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGG.h rename to gfx/skia/skia/src/svg/SkSVGG.h diff --git a/gfx/skia/trunk/src/svg/SkSVGGradient.cpp b/gfx/skia/skia/src/svg/SkSVGGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGGradient.cpp rename to gfx/skia/skia/src/svg/SkSVGGradient.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGGradient.h b/gfx/skia/skia/src/svg/SkSVGGradient.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGGradient.h rename to gfx/skia/skia/src/svg/SkSVGGradient.h diff --git a/gfx/skia/trunk/src/svg/SkSVGGroup.cpp b/gfx/skia/skia/src/svg/SkSVGGroup.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGGroup.cpp rename to gfx/skia/skia/src/svg/SkSVGGroup.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGGroup.h b/gfx/skia/skia/src/svg/SkSVGGroup.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGGroup.h rename to gfx/skia/skia/src/svg/SkSVGGroup.h diff --git a/gfx/skia/trunk/src/svg/SkSVGImage.cpp b/gfx/skia/skia/src/svg/SkSVGImage.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGImage.cpp rename to gfx/skia/skia/src/svg/SkSVGImage.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGImage.h b/gfx/skia/skia/src/svg/SkSVGImage.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGImage.h rename to gfx/skia/skia/src/svg/SkSVGImage.h diff --git a/gfx/skia/trunk/src/svg/SkSVGLine.cpp b/gfx/skia/skia/src/svg/SkSVGLine.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGLine.cpp rename to gfx/skia/skia/src/svg/SkSVGLine.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGLine.h b/gfx/skia/skia/src/svg/SkSVGLine.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGLine.h rename to gfx/skia/skia/src/svg/SkSVGLine.h diff --git a/gfx/skia/trunk/src/svg/SkSVGLinearGradient.cpp b/gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGLinearGradient.cpp rename to gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGLinearGradient.h b/gfx/skia/skia/src/svg/SkSVGLinearGradient.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGLinearGradient.h rename to gfx/skia/skia/src/svg/SkSVGLinearGradient.h diff --git a/gfx/skia/trunk/src/svg/SkSVGMask.cpp b/gfx/skia/skia/src/svg/SkSVGMask.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGMask.cpp rename to gfx/skia/skia/src/svg/SkSVGMask.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGMask.h b/gfx/skia/skia/src/svg/SkSVGMask.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGMask.h rename to gfx/skia/skia/src/svg/SkSVGMask.h diff --git a/gfx/skia/trunk/src/svg/SkSVGMetadata.cpp b/gfx/skia/skia/src/svg/SkSVGMetadata.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGMetadata.cpp rename to gfx/skia/skia/src/svg/SkSVGMetadata.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGMetadata.h b/gfx/skia/skia/src/svg/SkSVGMetadata.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGMetadata.h rename to gfx/skia/skia/src/svg/SkSVGMetadata.h diff --git a/gfx/skia/trunk/src/svg/SkSVGPaintState.cpp b/gfx/skia/skia/src/svg/SkSVGPaintState.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPaintState.cpp rename to gfx/skia/skia/src/svg/SkSVGPaintState.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGParser.cpp b/gfx/skia/skia/src/svg/SkSVGParser.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGParser.cpp rename to gfx/skia/skia/src/svg/SkSVGParser.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGPath.cpp b/gfx/skia/skia/src/svg/SkSVGPath.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPath.cpp rename to gfx/skia/skia/src/svg/SkSVGPath.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGPath.h b/gfx/skia/skia/src/svg/SkSVGPath.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPath.h rename to gfx/skia/skia/src/svg/SkSVGPath.h diff --git a/gfx/skia/trunk/src/svg/SkSVGPolygon.cpp b/gfx/skia/skia/src/svg/SkSVGPolygon.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPolygon.cpp rename to gfx/skia/skia/src/svg/SkSVGPolygon.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGPolygon.h b/gfx/skia/skia/src/svg/SkSVGPolygon.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPolygon.h rename to gfx/skia/skia/src/svg/SkSVGPolygon.h diff --git a/gfx/skia/trunk/src/svg/SkSVGPolyline.cpp b/gfx/skia/skia/src/svg/SkSVGPolyline.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPolyline.cpp rename to gfx/skia/skia/src/svg/SkSVGPolyline.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGPolyline.h b/gfx/skia/skia/src/svg/SkSVGPolyline.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGPolyline.h rename to gfx/skia/skia/src/svg/SkSVGPolyline.h diff --git a/gfx/skia/trunk/src/svg/SkSVGRadialGradient.cpp b/gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGRadialGradient.cpp rename to gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGRadialGradient.h b/gfx/skia/skia/src/svg/SkSVGRadialGradient.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGRadialGradient.h rename to gfx/skia/skia/src/svg/SkSVGRadialGradient.h diff --git a/gfx/skia/trunk/src/svg/SkSVGRect.cpp b/gfx/skia/skia/src/svg/SkSVGRect.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGRect.cpp rename to gfx/skia/skia/src/svg/SkSVGRect.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGRect.h b/gfx/skia/skia/src/svg/SkSVGRect.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGRect.h rename to gfx/skia/skia/src/svg/SkSVGRect.h diff --git a/gfx/skia/trunk/src/svg/SkSVGSVG.cpp b/gfx/skia/skia/src/svg/SkSVGSVG.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGSVG.cpp rename to gfx/skia/skia/src/svg/SkSVGSVG.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGSVG.h b/gfx/skia/skia/src/svg/SkSVGSVG.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGSVG.h rename to gfx/skia/skia/src/svg/SkSVGSVG.h diff --git a/gfx/skia/trunk/src/svg/SkSVGStop.cpp b/gfx/skia/skia/src/svg/SkSVGStop.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGStop.cpp rename to gfx/skia/skia/src/svg/SkSVGStop.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGStop.h b/gfx/skia/skia/src/svg/SkSVGStop.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGStop.h rename to gfx/skia/skia/src/svg/SkSVGStop.h diff --git a/gfx/skia/trunk/src/svg/SkSVGSymbol.cpp b/gfx/skia/skia/src/svg/SkSVGSymbol.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGSymbol.cpp rename to gfx/skia/skia/src/svg/SkSVGSymbol.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGSymbol.h b/gfx/skia/skia/src/svg/SkSVGSymbol.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGSymbol.h rename to gfx/skia/skia/src/svg/SkSVGSymbol.h diff --git a/gfx/skia/trunk/src/svg/SkSVGText.cpp b/gfx/skia/skia/src/svg/SkSVGText.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGText.cpp rename to gfx/skia/skia/src/svg/SkSVGText.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGText.h b/gfx/skia/skia/src/svg/SkSVGText.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGText.h rename to gfx/skia/skia/src/svg/SkSVGText.h diff --git a/gfx/skia/trunk/src/svg/SkSVGUse.cpp b/gfx/skia/skia/src/svg/SkSVGUse.cpp similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGUse.cpp rename to gfx/skia/skia/src/svg/SkSVGUse.cpp diff --git a/gfx/skia/trunk/src/svg/SkSVGUse.h b/gfx/skia/skia/src/svg/SkSVGUse.h similarity index 100% rename from gfx/skia/trunk/src/svg/SkSVGUse.h rename to gfx/skia/skia/src/svg/SkSVGUse.h diff --git a/gfx/skia/trunk/src/utils/SkBase64.cpp b/gfx/skia/skia/src/utils/SkBase64.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkBase64.cpp rename to gfx/skia/skia/src/utils/SkBase64.cpp diff --git a/gfx/skia/trunk/src/utils/SkBase64.h b/gfx/skia/skia/src/utils/SkBase64.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkBase64.h rename to gfx/skia/skia/src/utils/SkBase64.h diff --git a/gfx/skia/trunk/src/utils/SkBitSet.cpp b/gfx/skia/skia/src/utils/SkBitSet.cpp old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/utils/SkBitSet.cpp rename to gfx/skia/skia/src/utils/SkBitSet.cpp diff --git a/gfx/skia/trunk/src/utils/SkBitSet.h b/gfx/skia/skia/src/utils/SkBitSet.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkBitSet.h rename to gfx/skia/skia/src/utils/SkBitSet.h diff --git a/gfx/skia/trunk/src/utils/SkBitmapHasher.cpp b/gfx/skia/skia/src/utils/SkBitmapHasher.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkBitmapHasher.cpp rename to gfx/skia/skia/src/utils/SkBitmapHasher.cpp diff --git a/gfx/skia/trunk/src/utils/SkBitmapHasher.h b/gfx/skia/skia/src/utils/SkBitmapHasher.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkBitmapHasher.h rename to gfx/skia/skia/src/utils/SkBitmapHasher.h diff --git a/gfx/skia/trunk/src/utils/SkBoundaryPatch.cpp b/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkBoundaryPatch.cpp rename to gfx/skia/skia/src/utils/SkBoundaryPatch.cpp diff --git a/gfx/skia/trunk/src/utils/SkCamera.cpp b/gfx/skia/skia/src/utils/SkCamera.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCamera.cpp rename to gfx/skia/skia/src/utils/SkCamera.cpp diff --git a/gfx/skia/trunk/src/utils/SkCanvasStack.cpp b/gfx/skia/skia/src/utils/SkCanvasStack.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCanvasStack.cpp rename to gfx/skia/skia/src/utils/SkCanvasStack.cpp diff --git a/gfx/skia/trunk/src/utils/SkCanvasStack.h b/gfx/skia/skia/src/utils/SkCanvasStack.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkCanvasStack.h rename to gfx/skia/skia/src/utils/SkCanvasStack.h diff --git a/gfx/skia/trunk/src/utils/SkCanvasStateUtils.cpp b/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCanvasStateUtils.cpp rename to gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp diff --git a/gfx/skia/trunk/src/utils/SkCondVar.cpp b/gfx/skia/skia/src/utils/SkCondVar.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCondVar.cpp rename to gfx/skia/skia/src/utils/SkCondVar.cpp diff --git a/gfx/skia/trunk/src/utils/SkCubicInterval.cpp b/gfx/skia/skia/src/utils/SkCubicInterval.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCubicInterval.cpp rename to gfx/skia/skia/src/utils/SkCubicInterval.cpp diff --git a/gfx/skia/trunk/src/utils/SkCullPoints.cpp b/gfx/skia/skia/src/utils/SkCullPoints.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkCullPoints.cpp rename to gfx/skia/skia/src/utils/SkCullPoints.cpp diff --git a/gfx/skia/trunk/src/utils/SkDashPath.cpp b/gfx/skia/skia/src/utils/SkDashPath.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkDashPath.cpp rename to gfx/skia/skia/src/utils/SkDashPath.cpp diff --git a/gfx/skia/trunk/src/utils/SkDashPathPriv.h b/gfx/skia/skia/src/utils/SkDashPathPriv.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkDashPathPriv.h rename to gfx/skia/skia/src/utils/SkDashPathPriv.h diff --git a/gfx/skia/trunk/src/utils/SkDeferredCanvas.cpp b/gfx/skia/skia/src/utils/SkDeferredCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkDeferredCanvas.cpp rename to gfx/skia/skia/src/utils/SkDeferredCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkDumpCanvas.cpp b/gfx/skia/skia/src/utils/SkDumpCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkDumpCanvas.cpp rename to gfx/skia/skia/src/utils/SkDumpCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkEventTracer.cpp b/gfx/skia/skia/src/utils/SkEventTracer.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkEventTracer.cpp rename to gfx/skia/skia/src/utils/SkEventTracer.cpp diff --git a/gfx/skia/trunk/src/utils/SkFloatUtils.h b/gfx/skia/skia/src/utils/SkFloatUtils.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkFloatUtils.h rename to gfx/skia/skia/src/utils/SkFloatUtils.h diff --git a/gfx/skia/trunk/src/utils/SkFrontBufferedStream.cpp b/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkFrontBufferedStream.cpp rename to gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp diff --git a/gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.cpp b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.cpp rename to gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp diff --git a/gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.h b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.h rename to gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h diff --git a/gfx/skia/trunk/src/utils/SkInterpolator.cpp b/gfx/skia/skia/src/utils/SkInterpolator.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkInterpolator.cpp rename to gfx/skia/skia/src/utils/SkInterpolator.cpp diff --git a/gfx/skia/trunk/src/utils/SkLayer.cpp b/gfx/skia/skia/src/utils/SkLayer.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkLayer.cpp rename to gfx/skia/skia/src/utils/SkLayer.cpp diff --git a/gfx/skia/trunk/src/utils/SkLua.cpp b/gfx/skia/skia/src/utils/SkLua.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkLua.cpp rename to gfx/skia/skia/src/utils/SkLua.cpp diff --git a/gfx/skia/trunk/src/utils/SkLuaCanvas.cpp b/gfx/skia/skia/src/utils/SkLuaCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkLuaCanvas.cpp rename to gfx/skia/skia/src/utils/SkLuaCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkMD5.cpp b/gfx/skia/skia/src/utils/SkMD5.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkMD5.cpp rename to gfx/skia/skia/src/utils/SkMD5.cpp diff --git a/gfx/skia/trunk/src/utils/SkMD5.h b/gfx/skia/skia/src/utils/SkMD5.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkMD5.h rename to gfx/skia/skia/src/utils/SkMD5.h diff --git a/gfx/skia/trunk/src/utils/SkMatrix22.cpp b/gfx/skia/skia/src/utils/SkMatrix22.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkMatrix22.cpp rename to gfx/skia/skia/src/utils/SkMatrix22.cpp diff --git a/gfx/skia/trunk/src/utils/SkMatrix22.h b/gfx/skia/skia/src/utils/SkMatrix22.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkMatrix22.h rename to gfx/skia/skia/src/utils/SkMatrix22.h diff --git a/gfx/skia/trunk/src/utils/SkMatrix44.cpp b/gfx/skia/skia/src/utils/SkMatrix44.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkMatrix44.cpp rename to gfx/skia/skia/src/utils/SkMatrix44.cpp diff --git a/gfx/skia/trunk/src/utils/SkMeshUtils.cpp b/gfx/skia/skia/src/utils/SkMeshUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkMeshUtils.cpp rename to gfx/skia/skia/src/utils/SkMeshUtils.cpp diff --git a/gfx/skia/trunk/src/utils/SkNWayCanvas.cpp b/gfx/skia/skia/src/utils/SkNWayCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkNWayCanvas.cpp rename to gfx/skia/skia/src/utils/SkNWayCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkNinePatch.cpp b/gfx/skia/skia/src/utils/SkNinePatch.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkNinePatch.cpp rename to gfx/skia/skia/src/utils/SkNinePatch.cpp diff --git a/gfx/skia/trunk/src/utils/SkNullCanvas.cpp b/gfx/skia/skia/src/utils/SkNullCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkNullCanvas.cpp rename to gfx/skia/skia/src/utils/SkNullCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkOSFile.cpp b/gfx/skia/skia/src/utils/SkOSFile.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkOSFile.cpp rename to gfx/skia/skia/src/utils/SkOSFile.cpp diff --git a/gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp b/gfx/skia/skia/src/utils/SkPDFRasterizer.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp rename to gfx/skia/skia/src/utils/SkPDFRasterizer.cpp diff --git a/gfx/skia/trunk/src/utils/SkPDFRasterizer.h b/gfx/skia/skia/src/utils/SkPDFRasterizer.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkPDFRasterizer.h rename to gfx/skia/skia/src/utils/SkPDFRasterizer.h diff --git a/gfx/skia/trunk/src/utils/SkParse.cpp b/gfx/skia/skia/src/utils/SkParse.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkParse.cpp rename to gfx/skia/skia/src/utils/SkParse.cpp diff --git a/gfx/skia/trunk/src/utils/SkParseColor.cpp b/gfx/skia/skia/src/utils/SkParseColor.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkParseColor.cpp rename to gfx/skia/skia/src/utils/SkParseColor.cpp diff --git a/gfx/skia/trunk/src/utils/SkParsePath.cpp b/gfx/skia/skia/src/utils/SkParsePath.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkParsePath.cpp rename to gfx/skia/skia/src/utils/SkParsePath.cpp diff --git a/gfx/skia/trunk/src/utils/SkPathUtils.cpp b/gfx/skia/skia/src/utils/SkPathUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkPathUtils.cpp rename to gfx/skia/skia/src/utils/SkPathUtils.cpp diff --git a/gfx/skia/trunk/src/utils/SkPictureUtils.cpp b/gfx/skia/skia/src/utils/SkPictureUtils.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkPictureUtils.cpp rename to gfx/skia/skia/src/utils/SkPictureUtils.cpp diff --git a/gfx/skia/trunk/src/utils/SkProxyCanvas.cpp b/gfx/skia/skia/src/utils/SkProxyCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkProxyCanvas.cpp rename to gfx/skia/skia/src/utils/SkProxyCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/SkRTConf.cpp b/gfx/skia/skia/src/utils/SkRTConf.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkRTConf.cpp rename to gfx/skia/skia/src/utils/SkRTConf.cpp diff --git a/gfx/skia/trunk/src/utils/SkSHA1.cpp b/gfx/skia/skia/src/utils/SkSHA1.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkSHA1.cpp rename to gfx/skia/skia/src/utils/SkSHA1.cpp diff --git a/gfx/skia/trunk/src/utils/SkSHA1.h b/gfx/skia/skia/src/utils/SkSHA1.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkSHA1.h rename to gfx/skia/skia/src/utils/SkSHA1.h diff --git a/gfx/skia/trunk/src/utils/SkTFitsIn.h b/gfx/skia/skia/src/utils/SkTFitsIn.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTFitsIn.h rename to gfx/skia/skia/src/utils/SkTFitsIn.h diff --git a/gfx/skia/trunk/src/utils/SkTLogic.h b/gfx/skia/skia/src/utils/SkTLogic.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTLogic.h rename to gfx/skia/skia/src/utils/SkTLogic.h diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor.cpp rename to gfx/skia/skia/src/utils/SkTextureCompressor.cpp diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor.h b/gfx/skia/skia/src/utils/SkTextureCompressor.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor.h rename to gfx/skia/skia/src/utils/SkTextureCompressor.h diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.cpp rename to gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.h rename to gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.cpp rename to gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.h rename to gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.cpp rename to gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.h rename to gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils.h b/gfx/skia/skia/src/utils/SkThreadUtils.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils.h rename to gfx/skia/skia/src/utils/SkThreadUtils.h diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread.cpp rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread.h b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread.h rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread.h diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_mach.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_mach.cpp rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_other.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_other.cpp rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_win.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_win.cpp rename to gfx/skia/skia/src/utils/SkThreadUtils_win.cpp diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_win.h b/gfx/skia/skia/src/utils/SkThreadUtils_win.h similarity index 100% rename from gfx/skia/trunk/src/utils/SkThreadUtils_win.h rename to gfx/skia/skia/src/utils/SkThreadUtils_win.h diff --git a/gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.cpp b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.cpp rename to gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp diff --git a/gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.h b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.h rename to gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h diff --git a/gfx/skia/trunk/src/utils/debugger/SkDrawCommand.cpp b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkDrawCommand.cpp rename to gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp diff --git a/gfx/skia/trunk/src/utils/debugger/SkDrawCommand.h b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkDrawCommand.h rename to gfx/skia/skia/src/utils/debugger/SkDrawCommand.h diff --git a/gfx/skia/trunk/src/utils/debugger/SkObjectParser.cpp b/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkObjectParser.cpp rename to gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp diff --git a/gfx/skia/trunk/src/utils/debugger/SkObjectParser.h b/gfx/skia/skia/src/utils/debugger/SkObjectParser.h similarity index 100% rename from gfx/skia/trunk/src/utils/debugger/SkObjectParser.h rename to gfx/skia/skia/src/utils/debugger/SkObjectParser.h diff --git a/gfx/skia/trunk/src/utils/ios/SkFontHost_iOS.mm b/gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/utils/ios/SkFontHost_iOS.mm rename to gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm diff --git a/gfx/skia/trunk/src/utils/ios/SkImageDecoder_iOS.mm b/gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/utils/ios/SkImageDecoder_iOS.mm rename to gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm diff --git a/gfx/skia/trunk/src/utils/ios/SkOSFile_iOS.mm b/gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/utils/ios/SkOSFile_iOS.mm rename to gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm diff --git a/gfx/skia/trunk/src/utils/ios/SkStream_NSData.mm b/gfx/skia/skia/src/utils/ios/SkStream_NSData.mm old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/utils/ios/SkStream_NSData.mm rename to gfx/skia/skia/src/utils/ios/SkStream_NSData.mm diff --git a/gfx/skia/trunk/src/utils/mac/SkCreateCGImageRef.cpp b/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/mac/SkCreateCGImageRef.cpp rename to gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp diff --git a/gfx/skia/trunk/src/utils/mac/SkStream_mac.cpp b/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/mac/SkStream_mac.cpp rename to gfx/skia/skia/src/utils/mac/SkStream_mac.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkAutoCoInitialize.cpp b/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkAutoCoInitialize.cpp rename to gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkDWrite.cpp b/gfx/skia/skia/src/utils/win/SkDWrite.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWrite.cpp rename to gfx/skia/skia/src/utils/win/SkDWrite.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkDWrite.h b/gfx/skia/skia/src/utils/win/SkDWrite.h similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWrite.h rename to gfx/skia/skia/src/utils/win/SkDWrite.h diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.cpp b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.cpp rename to gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.h b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.h rename to gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.cpp b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.cpp rename to gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.h b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.h rename to gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h diff --git a/gfx/skia/trunk/src/utils/win/SkHRESULT.cpp b/gfx/skia/skia/src/utils/win/SkHRESULT.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkHRESULT.cpp rename to gfx/skia/skia/src/utils/win/SkHRESULT.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkIStream.cpp b/gfx/skia/skia/src/utils/win/SkIStream.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkIStream.cpp rename to gfx/skia/skia/src/utils/win/SkIStream.cpp diff --git a/gfx/skia/trunk/src/utils/win/SkWGL_win.cpp b/gfx/skia/skia/src/utils/win/SkWGL_win.cpp similarity index 100% rename from gfx/skia/trunk/src/utils/win/SkWGL_win.cpp rename to gfx/skia/skia/src/utils/win/SkWGL_win.cpp diff --git a/gfx/skia/trunk/src/views/SkBGViewArtist.cpp b/gfx/skia/skia/src/views/SkBGViewArtist.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkBGViewArtist.cpp rename to gfx/skia/skia/src/views/SkBGViewArtist.cpp diff --git a/gfx/skia/trunk/src/views/SkEvent.cpp b/gfx/skia/skia/src/views/SkEvent.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkEvent.cpp rename to gfx/skia/skia/src/views/SkEvent.cpp diff --git a/gfx/skia/trunk/src/views/SkEventSink.cpp b/gfx/skia/skia/src/views/SkEventSink.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkEventSink.cpp rename to gfx/skia/skia/src/views/SkEventSink.cpp diff --git a/gfx/skia/trunk/src/views/SkOSMenu.cpp b/gfx/skia/skia/src/views/SkOSMenu.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkOSMenu.cpp rename to gfx/skia/skia/src/views/SkOSMenu.cpp diff --git a/gfx/skia/trunk/src/views/SkParsePaint.cpp b/gfx/skia/skia/src/views/SkParsePaint.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkParsePaint.cpp rename to gfx/skia/skia/src/views/SkParsePaint.cpp diff --git a/gfx/skia/trunk/src/views/SkProgressView.cpp b/gfx/skia/skia/src/views/SkProgressView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkProgressView.cpp rename to gfx/skia/skia/src/views/SkProgressView.cpp diff --git a/gfx/skia/trunk/src/views/SkStackViewLayout.cpp b/gfx/skia/skia/src/views/SkStackViewLayout.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkStackViewLayout.cpp rename to gfx/skia/skia/src/views/SkStackViewLayout.cpp diff --git a/gfx/skia/trunk/src/views/SkTagList.cpp b/gfx/skia/skia/src/views/SkTagList.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkTagList.cpp rename to gfx/skia/skia/src/views/SkTagList.cpp diff --git a/gfx/skia/trunk/src/views/SkTagList.h b/gfx/skia/skia/src/views/SkTagList.h similarity index 100% rename from gfx/skia/trunk/src/views/SkTagList.h rename to gfx/skia/skia/src/views/SkTagList.h diff --git a/gfx/skia/trunk/src/views/SkTextBox.cpp b/gfx/skia/skia/src/views/SkTextBox.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkTextBox.cpp rename to gfx/skia/skia/src/views/SkTextBox.cpp diff --git a/gfx/skia/trunk/src/views/SkTouchGesture.cpp b/gfx/skia/skia/src/views/SkTouchGesture.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkTouchGesture.cpp rename to gfx/skia/skia/src/views/SkTouchGesture.cpp diff --git a/gfx/skia/trunk/src/views/SkView.cpp b/gfx/skia/skia/src/views/SkView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkView.cpp rename to gfx/skia/skia/src/views/SkView.cpp diff --git a/gfx/skia/trunk/src/views/SkViewInflate.cpp b/gfx/skia/skia/src/views/SkViewInflate.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkViewInflate.cpp rename to gfx/skia/skia/src/views/SkViewInflate.cpp diff --git a/gfx/skia/trunk/src/views/SkViewPriv.cpp b/gfx/skia/skia/src/views/SkViewPriv.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkViewPriv.cpp rename to gfx/skia/skia/src/views/SkViewPriv.cpp diff --git a/gfx/skia/trunk/src/views/SkViewPriv.h b/gfx/skia/skia/src/views/SkViewPriv.h similarity index 100% rename from gfx/skia/trunk/src/views/SkViewPriv.h rename to gfx/skia/skia/src/views/SkViewPriv.h diff --git a/gfx/skia/trunk/src/views/SkWidgets.cpp b/gfx/skia/skia/src/views/SkWidgets.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkWidgets.cpp rename to gfx/skia/skia/src/views/SkWidgets.cpp diff --git a/gfx/skia/trunk/src/views/SkWindow.cpp b/gfx/skia/skia/src/views/SkWindow.cpp similarity index 100% rename from gfx/skia/trunk/src/views/SkWindow.cpp rename to gfx/skia/skia/src/views/SkWindow.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkBorderView.cpp b/gfx/skia/skia/src/views/animated/SkBorderView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkBorderView.cpp rename to gfx/skia/skia/src/views/animated/SkBorderView.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkImageView.cpp b/gfx/skia/skia/src/views/animated/SkImageView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkImageView.cpp rename to gfx/skia/skia/src/views/animated/SkImageView.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkProgressBarView.cpp b/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkProgressBarView.cpp rename to gfx/skia/skia/src/views/animated/SkProgressBarView.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkScrollBarView.cpp b/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkScrollBarView.cpp rename to gfx/skia/skia/src/views/animated/SkScrollBarView.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkStaticTextView.cpp b/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkStaticTextView.cpp rename to gfx/skia/skia/src/views/animated/SkStaticTextView.cpp diff --git a/gfx/skia/trunk/src/views/animated/SkWidgetViews.cpp b/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp similarity index 100% rename from gfx/skia/trunk/src/views/animated/SkWidgetViews.cpp rename to gfx/skia/skia/src/views/animated/SkWidgetViews.cpp diff --git a/gfx/skia/trunk/src/views/ios/SkOSWindow_iOS.mm b/gfx/skia/skia/src/views/ios/SkOSWindow_iOS.mm old mode 100755 new mode 100644 similarity index 100% rename from gfx/skia/trunk/src/views/ios/SkOSWindow_iOS.mm rename to gfx/skia/skia/src/views/ios/SkOSWindow_iOS.mm diff --git a/gfx/skia/trunk/src/views/mac/SampleApp-Info.plist b/gfx/skia/skia/src/views/mac/SampleApp-Info.plist similarity index 100% rename from gfx/skia/trunk/src/views/mac/SampleApp-Info.plist rename to gfx/skia/skia/src/views/mac/SampleApp-Info.plist diff --git a/gfx/skia/trunk/src/views/mac/SampleApp.xib b/gfx/skia/skia/src/views/mac/SampleApp.xib similarity index 100% rename from gfx/skia/trunk/src/views/mac/SampleApp.xib rename to gfx/skia/skia/src/views/mac/SampleApp.xib diff --git a/gfx/skia/trunk/src/views/mac/SampleAppDelegate.h b/gfx/skia/skia/src/views/mac/SampleAppDelegate.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SampleAppDelegate.h rename to gfx/skia/skia/src/views/mac/SampleAppDelegate.h diff --git a/gfx/skia/trunk/src/views/mac/SampleAppDelegate.mm b/gfx/skia/skia/src/views/mac/SampleAppDelegate.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SampleAppDelegate.mm rename to gfx/skia/skia/src/views/mac/SampleAppDelegate.mm diff --git a/gfx/skia/trunk/src/views/mac/SkEventNotifier.h b/gfx/skia/skia/src/views/mac/SkEventNotifier.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkEventNotifier.h rename to gfx/skia/skia/src/views/mac/SkEventNotifier.h diff --git a/gfx/skia/trunk/src/views/mac/SkEventNotifier.mm b/gfx/skia/skia/src/views/mac/SkEventNotifier.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkEventNotifier.mm rename to gfx/skia/skia/src/views/mac/SkEventNotifier.mm diff --git a/gfx/skia/trunk/src/views/mac/SkNSView.h b/gfx/skia/skia/src/views/mac/SkNSView.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkNSView.h rename to gfx/skia/skia/src/views/mac/SkNSView.h diff --git a/gfx/skia/trunk/src/views/mac/SkNSView.mm b/gfx/skia/skia/src/views/mac/SkNSView.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkNSView.mm rename to gfx/skia/skia/src/views/mac/SkNSView.mm diff --git a/gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.cpp b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.cpp rename to gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp diff --git a/gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.mm b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.mm rename to gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm diff --git a/gfx/skia/trunk/src/views/mac/SkOptionsTableView.h b/gfx/skia/skia/src/views/mac/SkOptionsTableView.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkOptionsTableView.h rename to gfx/skia/skia/src/views/mac/SkOptionsTableView.h diff --git a/gfx/skia/trunk/src/views/mac/SkOptionsTableView.mm b/gfx/skia/skia/src/views/mac/SkOptionsTableView.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkOptionsTableView.mm rename to gfx/skia/skia/src/views/mac/SkOptionsTableView.mm diff --git a/gfx/skia/trunk/src/views/mac/SkSampleNSView.h b/gfx/skia/skia/src/views/mac/SkSampleNSView.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkSampleNSView.h rename to gfx/skia/skia/src/views/mac/SkSampleNSView.h diff --git a/gfx/skia/trunk/src/views/mac/SkSampleNSView.mm b/gfx/skia/skia/src/views/mac/SkSampleNSView.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkSampleNSView.mm rename to gfx/skia/skia/src/views/mac/SkSampleNSView.mm diff --git a/gfx/skia/trunk/src/views/mac/SkTextFieldCell.h b/gfx/skia/skia/src/views/mac/SkTextFieldCell.h similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkTextFieldCell.h rename to gfx/skia/skia/src/views/mac/SkTextFieldCell.h diff --git a/gfx/skia/trunk/src/views/mac/SkTextFieldCell.m b/gfx/skia/skia/src/views/mac/SkTextFieldCell.m similarity index 100% rename from gfx/skia/trunk/src/views/mac/SkTextFieldCell.m rename to gfx/skia/skia/src/views/mac/SkTextFieldCell.m diff --git a/gfx/skia/trunk/src/views/mac/skia_mac.mm b/gfx/skia/skia/src/views/mac/skia_mac.mm similarity index 100% rename from gfx/skia/trunk/src/views/mac/skia_mac.mm rename to gfx/skia/skia/src/views/mac/skia_mac.mm diff --git a/gfx/skia/trunk/src/views/sdl/SkOSWindow_SDL.cpp b/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp similarity index 100% rename from gfx/skia/trunk/src/views/sdl/SkOSWindow_SDL.cpp rename to gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp diff --git a/gfx/skia/trunk/src/views/unix/SkOSWindow_Unix.cpp b/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp similarity index 100% rename from gfx/skia/trunk/src/views/unix/SkOSWindow_Unix.cpp rename to gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp diff --git a/gfx/skia/trunk/src/views/unix/keysym2ucs.c b/gfx/skia/skia/src/views/unix/keysym2ucs.c similarity index 100% rename from gfx/skia/trunk/src/views/unix/keysym2ucs.c rename to gfx/skia/skia/src/views/unix/keysym2ucs.c diff --git a/gfx/skia/trunk/src/views/unix/skia_unix.cpp b/gfx/skia/skia/src/views/unix/skia_unix.cpp similarity index 100% rename from gfx/skia/trunk/src/views/unix/skia_unix.cpp rename to gfx/skia/skia/src/views/unix/skia_unix.cpp diff --git a/gfx/skia/trunk/src/views/win/SkOSWindow_win.cpp b/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp similarity index 100% rename from gfx/skia/trunk/src/views/win/SkOSWindow_win.cpp rename to gfx/skia/skia/src/views/win/SkOSWindow_win.cpp diff --git a/gfx/skia/trunk/src/views/win/skia_win.cpp b/gfx/skia/skia/src/views/win/skia_win.cpp similarity index 100% rename from gfx/skia/trunk/src/views/win/skia_win.cpp rename to gfx/skia/skia/src/views/win/skia_win.cpp diff --git a/gfx/skia/trunk/src/xml/SkBML_Verbs.h b/gfx/skia/skia/src/xml/SkBML_Verbs.h similarity index 100% rename from gfx/skia/trunk/src/xml/SkBML_Verbs.h rename to gfx/skia/skia/src/xml/SkBML_Verbs.h diff --git a/gfx/skia/trunk/src/xml/SkBML_XMLParser.cpp b/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkBML_XMLParser.cpp rename to gfx/skia/skia/src/xml/SkBML_XMLParser.cpp diff --git a/gfx/skia/trunk/src/xml/SkDOM.cpp b/gfx/skia/skia/src/xml/SkDOM.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkDOM.cpp rename to gfx/skia/skia/src/xml/SkDOM.cpp diff --git a/gfx/skia/trunk/src/xml/SkJS.cpp b/gfx/skia/skia/src/xml/SkJS.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkJS.cpp rename to gfx/skia/skia/src/xml/SkJS.cpp diff --git a/gfx/skia/trunk/src/xml/SkJSDisplayable.cpp b/gfx/skia/skia/src/xml/SkJSDisplayable.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkJSDisplayable.cpp rename to gfx/skia/skia/src/xml/SkJSDisplayable.cpp diff --git a/gfx/skia/trunk/src/xml/SkXMLParser.cpp b/gfx/skia/skia/src/xml/SkXMLParser.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkXMLParser.cpp rename to gfx/skia/skia/src/xml/SkXMLParser.cpp diff --git a/gfx/skia/trunk/src/xml/SkXMLPullParser.cpp b/gfx/skia/skia/src/xml/SkXMLPullParser.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkXMLPullParser.cpp rename to gfx/skia/skia/src/xml/SkXMLPullParser.cpp diff --git a/gfx/skia/trunk/src/xml/SkXMLWriter.cpp b/gfx/skia/skia/src/xml/SkXMLWriter.cpp similarity index 100% rename from gfx/skia/trunk/src/xml/SkXMLWriter.cpp rename to gfx/skia/skia/src/xml/SkXMLWriter.cpp diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index c5faf93b90..efc391fde0 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -83,7 +83,7 @@ #include "mozilla/Hal.h" #ifdef USE_SKIA -#include "skia/SkGraphics.h" +#include "skia/include/core/SkGraphics.h" # ifdef USE_SKIA_GPU # include "SkiaGLGlue.h" # endif diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 5daa130417..dfef0331bd 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -298,6 +298,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'): CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + DEFINES['GRAPHITE2_STATIC'] = True if CONFIG['GKMEDIAS_SHARED_LIBRARY']: diff --git a/image/Downscaler.cpp b/image/Downscaler.cpp index e511f3ca6c..fd93f66d7b 100644 --- a/image/Downscaler.cpp +++ b/image/Downscaler.cpp @@ -11,7 +11,7 @@ #include "gfxPrefs.h" #include "image_operations.h" #include "convolver.h" -#include "skia/SkTypes.h" +#include "skia/include/core/SkTypes.h" using std::max; using std::swap; diff --git a/image/moz.build b/image/moz.build index 7d84258bfe..1a19d7bfc6 100644 --- a/image/moz.build +++ b/image/moz.build @@ -103,3 +103,6 @@ LOCAL_INCLUDES += [ # Because imgFrame.cpp includes "cairo.h" CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + +LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build index 01673f7da0..ccf3454b5a 100644 --- a/other-licenses/skia-npapi/moz.build +++ b/other-licenses/skia-npapi/moz.build @@ -24,7 +24,7 @@ LOCAL_INCLUDES += [ '/dom/plugins/base', '/dom/plugins/base/android', '/gfx/gl', - '/gfx/skia/trunk/include/config', - '/gfx/skia/trunk/include/core', + '/gfx/skia/skia/include/config', + '/gfx/skia/skia/include/core', ] diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index 3f43e745df..9d2e7aab04 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -70,8 +70,8 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/dom/media/omx/mediaresourcemanager', '/dom/system/android', - '/gfx/skia/trunk/include/config', - '/gfx/skia/trunk/include/core', + '/gfx/skia/skia/include/config', + '/gfx/skia/skia/include/core', '/widget', ]