Revert of Sketch splitting SkPicture into an interface and SkBigPicture. (patchset...
authormtklein <mtklein@google.com>
Mon, 18 May 2015 21:53:43 +0000 (14:53 -0700)
committerCommit bot <commit-bot@chromium.org>
Mon, 18 May 2015 21:53:43 +0000 (14:53 -0700)
commit72743b165424efc4ef6f6614add9033ea1ef31db
tree26ebea2ec4df12ec4d94cb3089b4f3d82a032322
parent4f2dba625dd858ea3591974d793ef18c10c2ca67
Revert of Sketch splitting SkPicture into an interface and SkBigPicture. (patchset #25 id:480001 of https://codereview.chromium.org/1112523006/)

Reason for revert:
win_chromium_compile_dbg_ng

FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\skia\src\core\skia.SkBitmapHeap.obj.rsp /c ..\..\third_party\skia\src\core\SkBitmapHeap.cpp /Foobj\third_party\skia\src\core\skia.SkBitmapHeap.obj /Fdobj\skia\skia.cc.pdb
e:\b\build\slave\win\build\src\third_party\skia\include\core\skpicture.h(176) : error C2487: 'CURRENT_PICTURE_VERSION' : member of dll interface class may not be declared with dll interface

Original issue's description:
> Sketch splitting SkPicture into an interface and SkBigPicture.
>
> Adds small pictures for drawRect(), drawTextBlob(), and drawPath().
> These cover about 89% of draw calls from Blink SKPs,
> and about 25% of draw calls from our GMs.
>
> SkPicture handles:
>   - serialization and deserialization
>   - unique IDs
>
> Everything else is left to the subclasses:
>   - playback(), cullRect()
>   - hasBitmap(), hasText(), suitableForGPU(), etc.
>   - LayerInfo / AccelData if applicable.
>
> The time to record a 1-op picture improves a good chunk
> (2 mallocs to 1), and the time to record a 0-op picture
> greatly improves (2 mallocs to none):
>
>     picture_overhead_draw:   450ns -> 350ns
>     picture_overhead_nodraw: 300ns -> 90ns
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c92c129ff85b05a714bd1bf921c02d5e14651f8b
>
> Latest blink_linux_rel:
>
> http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/61248
>
> Committed: https://skia.googlesource.com/skia/+/15877b6eae33a9282458bdb904a6d00440eca0ec

TBR=reed@google.com,robertphillips@google.com,fmalita@chromium.org,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1130283004
26 files changed:
gyp/core.gypi
gyp/utils.gypi
include/core/SkPicture.h
include/core/SkPictureRecorder.h
include/utils/SkPictureUtils.h
src/core/SkBigPicture.cpp [deleted file]
src/core/SkBigPicture.h [deleted file]
src/core/SkLayerInfo.cpp [new file with mode: 0644]
src/core/SkLayerInfo.h
src/core/SkMiniRecorder.cpp [deleted file]
src/core/SkMiniRecorder.h [deleted file]
src/core/SkPicture.cpp
src/core/SkPictureCommon.h [deleted file]
src/core/SkPictureRecorder.cpp
src/core/SkRecordDraw.cpp
src/core/SkRecordDraw.h
src/core/SkRecorder.cpp
src/core/SkRecorder.h
src/core/SkRecords.h
src/gpu/GrLayerHoister.cpp
src/gpu/GrRecordReplaceDraw.cpp
src/gpu/SkGpuDevice.cpp
src/gpu/SkGpuDevice.h
src/utils/SkPictureUtils.cpp [new file with mode: 0644]
tests/GpuLayerCacheTest.cpp
tests/PictureTest.cpp