Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (patchset...
authorbsalomon <bsalomon@google.com>
Thu, 25 Feb 2016 14:52:12 +0000 (06:52 -0800)
committerCommit bot <commit-bot@chromium.org>
Thu, 25 Feb 2016 14:52:12 +0000 (06:52 -0800)
commitbd500f09ce5b1ca464431d693f9ec5da60a59230
tree16d46d581f91f0ebbb9fbf2316be2be7fac32ad8
parent2d07b76405a672dced858aaa9ed475755ea13305
Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (patchset #6 id:100001 of https://codereview.chromium.org/1728093005/ )

Reason for revert:
Need workaround for chrome to build

Original issue's description:
> Move Budgeted enum out of SkSurface, use in GrTextureProvider
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
> DOCS_PREVIEW= https://skia.org/?cl=1728093005
>
> Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c

TBR=reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1734043002
87 files changed:
bench/nanobench.cpp
cmake/example.cpp
dm/DMGpuSupport.h
experimental/fiddle/fiddle_main.cpp
gm/bleed.cpp
gm/dftext.cpp
gm/discard.cpp
gm/image.cpp
gm/image_pict.cpp
gm/image_shader.cpp
gm/imagetoyuvplanes.cpp
gm/surface.cpp
gm/texdata.cpp
gm/textblobmixedsizes.cpp
gm/xfermodes3.cpp
include/core/SkSurface.h
include/core/SkTypes.h
include/gpu/GrTextureProvider.h
site/user/api/canvas.md
src/core/SkCanvas.cpp
src/core/SkImageCacherator.cpp
src/core/SkPictureImageGenerator.cpp
src/effects/GrCircleBlurFragmentProcessor.cpp
src/effects/SkBlurMaskFilter.cpp
src/effects/SkColorCubeFilter.cpp
src/gpu/GrContext.cpp
src/gpu/GrGpu.cpp
src/gpu/GrGpu.h
src/gpu/GrGpuResource.cpp
src/gpu/GrGpuResourceCacheAccess.h
src/gpu/GrGpuResourcePriv.h
src/gpu/GrLayerAtlas.cpp
src/gpu/GrLayerCache.cpp
src/gpu/GrResourceCache.cpp
src/gpu/GrResourceCache.h
src/gpu/GrTest.cpp
src/gpu/GrTextureParamsAdjuster.cpp
src/gpu/GrTextureProvider.cpp
src/gpu/GrYUVProvider.cpp
src/gpu/SkGpuDevice.cpp
src/gpu/SkGpuDevice.h
src/gpu/SkGr.cpp
src/gpu/SkGrPixelRef.cpp
src/gpu/effects/GrConfigConversionEffect.cpp
src/gpu/effects/GrTextureStripAtlas.cpp
src/gpu/gl/GrGLGpu.cpp
src/image/SkImage.cpp
src/image/SkImagePriv.h
src/image/SkImage_Gpu.cpp
src/image/SkImage_Gpu.h
src/image/SkSurface.cpp
src/image/SkSurface_Base.h
src/image/SkSurface_Gpu.cpp
src/image/SkSurface_Gpu.h
src/image/SkSurface_Raster.cpp
src/utils/SkImageGeneratorUtils.cpp
tests/BitmapCopyTest.cpp
tests/BlurTest.cpp
tests/ClearTest.cpp
tests/ClipBoundsTest.cpp
tests/CopySurfaceTest.cpp
tests/EGLImageTest.cpp
tests/FloatingPointTextureTest.cpp
tests/GLProgramsTest.cpp
tests/GpuDrawPathTest.cpp
tests/GrSurfaceTest.cpp
tests/GrTextureMipMapInvalidationTest.cpp
tests/ImageFilterCacheTest.cpp
tests/ImageFilterTest.cpp
tests/ImageIsOpaqueTest.cpp
tests/ImageNewShaderTest.cpp
tests/ImageTest.cpp
tests/PremulAlphaRoundTripTest.cpp
tests/ReadPixelsTest.cpp
tests/ReadWriteAlphaTest.cpp
tests/RecordReplaceDrawTest.cpp
tests/RectangleTextureTest.cpp
tests/ResourceCacheTest.cpp
tests/SRGBReadWritePixelsTest.cpp
tests/SpecialImageTest.cpp
tests/SurfaceTest.cpp
tests/TextBlobCacheTest.cpp
tests/TextureStorageAllocator.cpp
tests/WritePixelsTest.cpp
tools/VisualBench/WrappedBenchmark.h
tools/kilobench/kilobench.cpp
tools/skiaserve/skiaserve.cpp