aboutsummaryrefslogtreecommitdiffhomepage
path: root/debugger
Commit message (Collapse)AuthorAge
* Remove SkPictureFlat.h include from SkDrawCommands.hGravatar robertphillips2015-02-13
| | | | | | | | | | This cannot land until https://codereview.chromium.org/909353004/ (Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes) lands in Chromium Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976 Committed: https://skia.googlesource.com/skia/+/fa3a83d0fe53907e618346d3f1c17a95da1a9d22 Review URL: https://codereview.chromium.org/912403004
* Revert of Remove SkPictureFlat.h include from SkDrawCommands.h (patchset #3 ↵Gravatar robertphillips2015-02-12
| | | | | | | | | | | | | | | | | | | | | | | id:40001 of https://codereview.chromium.org/912403004/) Reason for revert: Erm - Chrome. Original issue's description: > Remove SkPictureFlat.h include from SkDrawCommands.h > > This cannot land until https://codereview.chromium.org/909353004/ (Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes) lands in Chromium > > Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976 > > Committed: https://skia.googlesource.com/skia/+/fa3a83d0fe53907e618346d3f1c17a95da1a9d22 TBR=reed@google.com,fmalita@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/923753002
* Remove SkPictureFlat.h include from SkDrawCommands.hGravatar robertphillips2015-02-12
| | | | | | | | This cannot land until https://codereview.chromium.org/909353004/ (Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes) lands in Chromium Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976 Review URL: https://codereview.chromium.org/912403004
* Revert of Fix Chromium build (patchset #2 id:20001 of ↵Gravatar robertphillips2015-02-11
| | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/916763003/) Reason for revert: Chrome Original issue's description: > Fix Chromium build > > TBR=jvanverth@google.com > > Committed: https://skia.googlesource.com/skia/+/f5e89c8f685ac8a5c4d117e087b4111d613106db TBR=jvanverth@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/916963002
* Revert of Remove SkPictureFlat.h include from SkDrawCommands.h (patchset #2 ↵Gravatar robertphillips2015-02-11
| | | | | | | | | | | | | | | | | | | id:20001 of https://codereview.chromium.org/912403004/) Reason for revert: Chrome Original issue's description: > Remove SkPictureFlat.h include from SkDrawCommands.h > > Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976 TBR=reed@google.com,fmalita@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/917933002
* Fix Chromium buildGravatar robertphillips2015-02-11
| | | | | | TBR=jvanverth@google.com Review URL: https://codereview.chromium.org/916763003
* Remove SkPictureFlat.h include from SkDrawCommands.hGravatar robertphillips2015-02-11
| | | | Review URL: https://codereview.chromium.org/912403004
* debugger: Abandon context when Qt changes it without noticeGravatar kkinnunen2015-02-10
| | | | | | | | | | | | | Qt changes the context on many conditions. Abandon GrContext in these cases. Also call GrContext::resetContext during Qt GL paint callback, the GL state may be touched by Qt. Fixes the bug where changing between gpu and msaa would start erroring in framebuffer binds, if the .skp had many layers. Review URL: https://codereview.chromium.org/915573002
* Make SkStream *not* ref counted.Gravatar scroggo2015-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkStream is a stateful object, so it does not make sense for it to have multiple owners. Make SkStream inherit directly from SkNoncopyable. Update methods which previously called SkStream::ref() (e.g. SkImageDecoder::buildTileIndex() and SkFrontBufferedStream::Create(), which required the existing owners to call SkStream::unref()) to take ownership of their SkStream parameters and delete when done (including on failure). Switch all SkAutoTUnref<SkStream>s to SkAutoTDelete<SkStream>s. In some cases this means heap allocating streams that were previously stack allocated. Respect ownership rules of SkTypeface::CreateFromStream() and SkImageDecoder::buildTileIndex(). Update the comments for exceptional methods which do not affect the ownership of their SkStream parameters (e.g. SkPicture::CreateFromStream() and SkTypeface::Deserialize()) to be explicit about ownership. Remove test_stream_life, which tested that buildTileIndex() behaved correctly when SkStream was a ref counted object. The test does not make sense now that it is not. In SkPDFStream, remove the SkMemoryStream member. Instead of using it, create a new SkMemoryStream to pass to fDataStream (which is now an SkAutoTDelete). Make other pdf rasterizers behave like SkPDFDocumentToBitmap. SkPDFDocumentToBitmap delete the SkStream, so do the same in the following pdf rasterizers: SkPopplerRasterizePDF SkNativeRasterizePDF SkNoRasterizePDF Requires a change to Android, which currently treats SkStreams as ref counted objects. Review URL: https://codereview.chromium.org/849103004
* Fix debugger wrt to new SkGpuDevice factory signature'Gravatar Brian Salomon2015-01-16
| | | | Review URL: https://codereview.chromium.org/855083003
* Remove incremental draw optimization from SkDebugCanvasGravatar kkinnunen2015-01-13
| | | | | | | | | | | | | | | | | | | | | | | The SkDebugCanvas can be (or is currently) being used to draw to multiple different canvases. If this use-case is intended, then storing draw -related state in the canvas causes bugs. Remove incremental draw from SkDebugCanvas. It can only optimize the case where draw command index is advanced, no other changes are done and no visualization is used. This case is not that critical, as it happens only once per new frame at most. It causes bugs, because one SkDebugCanvas is used to draw to multiple canvases. Leave the draw to canvas in same state as it was passed in. This fixes the debugger bugs where: * Old, stale image would stay on the raster canvas when a new image is loaded. Also happened with resizes. * Proper image for overdraw filter would be visible only for the first frame Review URL: https://codereview.chromium.org/844493003
* debugger: SW rasterize the picture only when it changesGravatar kkinnunen2015-01-13
| | | | | | | | | | | | | | Rasterize the picture only when it changes, not every time raster widget paints itself. Removes include SkForceLinking.h while organizing the SkDebuggerGUI.cpp includes. This is part of the work trying to remove bugs that come from SkDebugCanvas stateful draw. Part of the state comes from some optimization that this tries to reproduce in a different way. Review URL: https://codereview.chromium.org/839743003
* debugger: Update inspector view data consistently while pausedGravatar kkinnunen2015-01-07
| | | | | | | | | | | | Make all fields of inspector view (details tab, clipstack tab, geometry view) update the correct info when user selects a draw command. Also update the info regardless if the painting is paused or not. Current clip and matrix will not update consistently even after this patch, as they depend on stateful debug canvas draw (may be fixed later). Review URL: https://codereview.chromium.org/835903002
* Remove draw window size state from SkDebugCanvasGravatar kkinnunen2015-01-05
| | | | | | | | | | | | | | | | | The SkDebugCanvas can be (or is currently) being used to draw to multiple different canvases. If this use-case is intended, then storing draw -related state in the canvas causes bugs. Remove draw window size state form SkDebugCanvas. Instead, use the canvas base layer size as the window size to clip to. This is consistent with the current use in debugger. This is part of work trying to remove bugs in debugger that result from replaying one SkDrawCanvas to two different canvases. Currently the SkDrawCanvas stores state that can only be valid if it is used for one canvas. Review URL: https://codereview.chromium.org/835113002
* debugger: Update the picture view when the first command is selectedGravatar kkinnunen2015-01-05
| | | | | | | Update the picture view in the debugger when the first command is selected. DebugCanvas::drawTo(index) draws up to and including the index. Review URL: https://codereview.chromium.org/837483002
* debugger: Remove few redundant variablesGravatar kkinnunen2015-01-05
| | | | | | | | | | | Use the GUI widget states instead of instance variables reflecting the widget state. Fixes the case where pause state would be left on when switching files, but the image would change to the last frame of newly loaded image. Review URL: https://codereview.chromium.org/810033004
* debugger: Move Skia initialization out of the GUI widget classGravatar kkinnunen2015-01-02
| | | | | | | | | | Move Skia initialization out of the GUI widget class to the main function. Before, Skia may have been already called before the SkGraphics::Init was run. Review URL: https://codereview.chromium.org/822583003
* debugger: Make inspector widget smallerGravatar kkinnunen2015-01-02
| | | | | | | | | | | | | | | | Make inspector widget a bit smaller by letting the Qt widget system layout the widgets. Let the inspector widget calculate its own smallest size. Use stretch factor of 0 for inspector, 1 for picture canvas. Group the matrix and clip widgets in groups. Put the text edits in a grid layout instead of a handwritted column layout containing row layouts. This commit is part of work that tries to make the debugger window to be a bit more resizeable, so that it would fit 1900x1200 screen. Review URL: https://codereview.chromium.org/830743002
* debugger: Make draw command image widget resizeGravatar kkinnunen2014-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | Make draw command image widget resize. The widget was not resizing, effectively preventing the window from being resized smaller. Make the rasterized draw command image be proportional to the widget size. The draw rasterization canvas is still an equilateral rectangle with dimensions of the smaller side of the widget. Makes the widget re-rasterize the image only when the draw command changes, not for each widget paint. Renames the widget from "image widget" to "draw command geometry widget". Makes the background of the image black, similar to the raster widget background. Adds a tooltip saying "Command geometry" for the widget, so that user might understand what the contents should be. This commit is part of work that tries to make the debugger window to be a bit more resizeable, so that it would fit 1900x1200 screen. Review URL: https://codereview.chromium.org/787143004
* debugger: Make settings widget resizeableGravatar kkinnunen2014-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The settings widget was laid out by hand, eg. the widths of most elements were hardcoded. This prevented it from being laid out by the Qt widget system. This in turn prevents the widget from shrinking to its optimal size. This in turn causes cascading effect where the geometry of many of the UI widgets has to be hard-coded. This in turn prevents proper resizing of the UI. Make Qt layout the settings widget by following changes: a) Group settings in QGroupBox groups instead of hand-written layouts and labels hardcoded in certain places. b) Remove "Expanding" size policy from settings widget. The widget calculates its own size based on the widgets inside. Thus "Preferred" is the correct policy to use, as expanding the widget will not bring any new content visible. c) Remove maximum width 250 from Settings widget d) Make "canvas settings and image layout", eg. the horizontal layout holding the settings widget divide the space between the picture and settings like so: settings uses up only as much as it needs (stretch factor 0), while picture uses up everything else (stretch factor 1). In order to do a) reasonably, reorganize the UI and the code a bit: a1) Rename settings group "visual filter" to "Visualizations". a2) Make "visual filter: on/off" combo box a checkbox in "Visualizations". a3) Move "Mega viz" setting checkbox from "raster" (or "render targets") section to "Visualizations" a4) Move "PathOps" setting checkbox from "raster" to "Visualizations" a5) Make Raster and GL checkboxes use QGroupBox checkbox feature a6) Move "current command", "command hitbox" and "zoom level" from "Settings" widget to part of "Inspector" concept. These pieces of information are now visualized as their own box in the right-hand bar, below settings. a7) Do not expose settings user selects through the UI widgets state that record the user interacts with. Instead, expose it as state of the "settings widget". Thus settings widget provides "raster settings changed" signal, which the client hook to and then query the state through the object API. This makes the full window a bit shorter. This commit is part of work that tries to make the debugger window to be a bit more resizeable, so that it would fit 1900x1200 screen. Review URL: https://codereview.chromium.org/829933002
* Change DebugCanvas API to not encourage memory leaksGravatar kkinnunen2014-12-30
| | | | | | | | | | Pass command strings and offset arrays as out parameters instead of returning new arrays from the functions. This simplifies debugger leak investigations, as the app leaks less by design. Review URL: https://codereview.chromium.org/821663003
* Avoid leaking render targets in debuggerGravatar kkinnunen2014-12-22
| | | | | | Render targets were not unreffed when QGLWidget::resizeGL was called. Review URL: https://codereview.chromium.org/817243002
* Make debugger raster window background blackGravatar kkinnunen2014-12-22
| | | | | | | | | | Make debugger raster window background black. This helps to understand where the picture boundaries are. It is probably more common for pictures to have non-black background vs non-white background. This makes raster window similar to opengl window. Review URL: https://codereview.chromium.org/816363002
* Cull pushCull and popCull from Skia.Gravatar mtklein2014-12-12
| | | | | | | | These calls are unused and going away. Waiting on crrev.com/796083002. BUG=skia: Review URL: https://codereview.chromium.org/794263002
* More SkPicture cleanupGravatar mtklein2014-11-17
| | | | | | | | | | | | | | | | - move field declarations together and pack them a little tighter - get rid of fData - remove dead code in debugger, including unused SkPicturePlayback subclass There are now no more long-lived SkPictureData! (Really, there never were, but now we don't pretend to support them.) BUG=skia: No API changes. TBR=reed@google.com Review URL: https://codereview.chromium.org/725143002
* Fix debugger with GL to work with non-default localeGravatar kkinnunen2014-11-13
| | | | | | | | | | | | QApplication forces the process to use the C locale system on "Unix/Linux" according to the docs. The float numbers in GL shaders will be printed with printf. These will be formatted with comma in certain locales, like LC_NUMERIC=fi_FI.UTF-8. Force the NC_NUMERIC=C before running the QApplication. Review URL: https://codereview.chromium.org/724753002
* Revert of Revert of SkDrawCommand scrubbing (patchset #1 id:1 of ↵Gravatar fmalita2014-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/712683002/) Reason for revert: Chromium clients updated, this should be canary-proof now. Original issue's description: > Revert of SkDrawCommand scrubbing (patchset #2 id:20001 of https://codereview.chromium.org/706363002/) > > Reason for revert: > Canary borkage. > > Original issue's description: > > SkDrawCommand scrubbing > > > > Remove unused ctor, constify, etc. > > > > R=robertphillips@google.com > > > > Committed: https://skia.googlesource.com/skia/+/1931ec5b5dac68f1e452af0c65161bdce35b2dec > > TBR=robertphillips@google.com > NOTREECHECKS=true > NOTRY=true > > Committed: https://skia.googlesource.com/skia/+/9063ddd511f8e0d8c7454950cbc56e273678bf60 TBR=robertphillips@google.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/708333002
* Revert of SkDrawCommand scrubbing (patchset #2 id:20001 of ↵Gravatar fmalita2014-11-07
| | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/706363002/) Reason for revert: Canary borkage. Original issue's description: > SkDrawCommand scrubbing > > Remove unused ctor, constify, etc. > > R=robertphillips@google.com > > Committed: https://skia.googlesource.com/skia/+/1931ec5b5dac68f1e452af0c65161bdce35b2dec TBR=robertphillips@google.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/712683002
* SkDrawCommand scrubbingGravatar fmalita2014-11-07
| | | | | | | | Remove unused ctor, constify, etc. R=robertphillips@google.com Review URL: https://codereview.chromium.org/706363002
* Update old tools to allow MultiPictureDraw renderingGravatar robertphillips2014-10-09
| | | | | | I'll post a separate patch for nanobench and dm Review URL: https://codereview.chromium.org/639013003
* Introduce Props to surface (patchset #27 id:520001 of ↵Gravatar reed2014-09-22
| | | | | | | | | | | | https://codereview.chromium.org/551463004/)" This reverts commit 29c857d0f3a1cb837f73406eeb6ba9771879b5e7. TBR= Author: reed@google.com Review URL: https://codereview.chromium.org/588143004
* Revert of introduce Props to surface (patchset #27 id:520001 of ↵Gravatar reed2014-09-21
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/551463004/) Reason for revert: Broke call site in WebKit Original issue's description: > introduce Props to surface (work in progress) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/3716fd067a5621bb94a6cb08d72afec8bf3aceda R=robertphillips@google.com, bsalomon@google.com, jvanverth@google.com, bungeman@google.com, fmalita@google.com, vangelis@chromium.org, reed@google.com TBR=bsalomon@google.com, bungeman@google.com, fmalita@google.com, jvanverth@google.com, reed@google.com, robertphillips@google.com, vangelis@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@chromium.org Review URL: https://codereview.chromium.org/583773004
* introduce Props to surface (work in progress)Gravatar reed2014-09-21
| | | | | | | | | BUG=skia: R=robertphillips@google.com, bsalomon@google.com, jvanverth@google.com, bungeman@google.com, fmalita@google.com, vangelis@chromium.org, reed@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/551463004
* "NULL !=" = NULLGravatar bsalomon2014-09-05
| | | | | | | | R=reed@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/544233002
* Change SkPicture::draw to playbackGravatar robertphillips2014-09-04
| | | | | | | | R=reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/540963002
* Hide fields in SkImageInfoGravatar reed2014-09-03
| | | | | | | | | R=rmistry@google.com TBR=bsalomon Author: reed@google.com Review URL: https://codereview.chromium.org/536003002
* Try out scalar picture sizesGravatar robertphillips2014-08-29
| | | | | | | | | | This paves the way for removing the 'fTile' parameter from SkPictureShader (although that should be a different CL). If we like this we could also move to providing an entire cull SkRect. R=reed@google.com, mtklein@google.com, fmalita@google.com, fmalita@chromium.org Author: robertphillips@google.com Review URL: https://codereview.chromium.org/513983002
* Make SkGpuDevice constructors private.Gravatar bsalomon2014-08-28
| | | | | | | | R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/517033002
* Fixed up SkTimedPicturePlaybackGravatar robertphillips2014-07-08
| | | | | | | | | | This was more motivated to remove the preDraw and postDraw virtuals from SkPicturePlayback. R=mtklein@google.com, reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/375943002
* Split SkPicturePlayback out of SkPictureDataGravatar robertphillips2014-07-07
| | | | | | | | | | | | | | | | | | | This splits the playback functionality out of SkPictureData. The old SkPictureData::draw method is pulled out along with its supporting functions as verbatim as possible. Some follow on CLs will be required to: re-enable profiling in the debugger (and remove the vestiges of SkTimedPicture) re-enable display of command offsets in the picture (this should probably wait until we've switched to SkRecord though) Clean up CachedOperationList (maybe fuse with SkPicture::OperationList) Split SkPicturePlayback into a base class and two derived classes Implement parallel version of GatherGPUInfo for SkRecord Landing this is blocked on removing Android's use of the abortPlayback entry point. R=mtklein@google.com, reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/377623002
* Rename SkPicturePlayback to SkPictureDataGravatar robertphillips2014-07-01
| | | | | | | | | | This is in preparation for splitting the playback portion of the new SkPictureData class into a new SkPicturePlayback class. R=reed@google.com, mtklein@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/362773002
* Enable basic drawing with SkRecord-based pictures.Gravatar Mike Klein2014-06-23
| | | | | | | | | | | | | | | | | I've tagged all the functions in SkPicture.cpp is // fRecord TODO or // fRecord OK, depending on whether or not they're totally broken when used from an SkRecord-based picture. Obviously next steps are to eliminate all the TODOs, then clean up the notes. I converted SkPicture over to smart pointers too. It's particularly helpful that the smart pointers initialize to NULL by default. For now I've got all the SkRecord-based code jammed in at the bottom of the file. I figure it'll help me keep things straight for a bit, then we can rearrange later. BUG=skia: R=robertphillips@google.com Review URL: https://codereview.chromium.org/333823007
* Move BenchTimer to tools as TimerGravatar mtklein2014-06-20
| | | | | | | | | | | | | | | This breaks a bunch of circular dependencies between tools and gm and bench. BUG=skia: Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Debug-iOS-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot R=tfarina@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/344213003
* Revert of Move BenchTimer to tools as Timer ↵Gravatar mtklein2014-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/344213003/) Reason for revert: GpuTimer broken Original issue's description: > Move BenchTimer to tools as Timer > > This breaks a bunch of circular dependencies between tools and gm and bench. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed R=tfarina@chromium.org, mtklein@chromium.org TBR=mtklein@chromium.org, tfarina@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Author: mtklein@google.com Review URL: https://codereview.chromium.org/346753003
* Move BenchTimer to tools as TimerGravatar mtklein2014-06-20
| | | | | | | | | | | This breaks a bunch of circular dependencies between tools and gm and bench. BUG=skia: R=tfarina@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/344213003
* Remove SkPicture pointer from SkPicturePlaybackGravatar robertphillips2014-06-12
| | | | | | | | | | This CL simplifies the relationship between SkPicture and SkPicturePlayback by moving the path heap into SkPicturePlayback and removing SkPicturePlayback's SkPicture pointer. R=mtklein@google.com, reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/334493002
* hide SkBitmap::setConfigGravatar reed2014-06-09
| | | | | | | | | | patch from issue 325733002 TBR=scroggo Author: reed@chromium.org Review URL: https://codereview.chromium.org/322963002
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-05-20
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@14793 2bbb7eff-a529-9590-31e7-b0007b416f81
* This adds a checkbox to the debugger to allow seeing the effect pathops has ↵Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | on the clip. A new tab shows the C code that the pathops generate. Once in place, this CL found a bug in the pathops code where it was not handling empty clip stack elements correctly. The Cl also has the change to SkCanvas to fix this bug. R=robertphillips@google.com, reed@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/282283002 git-svn-id: http://skia.googlecode.com/svn/trunk@14774 2bbb7eff-a529-9590-31e7-b0007b416f81
* render_pictures: add --mismatchPath flagGravatar commit-bot@chromium.org2014-05-15
| | | | | | | | | | | | | When set, it will only write out images that don't match expectations. BUG=skia:1942 R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/283123002 git-svn-id: http://skia.googlecode.com/svn/trunk@14748 2bbb7eff-a529-9590-31e7-b0007b416f81