Commit Graph

167 Commits

Author SHA1 Message Date
robertphillips@google.com
9b051a375b Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-20 20:06:40 +00:00
robertphillips@google.com
3055b70018 Split SkDevice out of SkBitmapDevice
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-20 17:49:04 +00:00
commit-bot@chromium.org
fde1e7ccb4 Support MSAA in the picture debugger
Add radio buttons for setting the GL sample count to 0 ("off"), 4 or
16.

Change the default mode of the GL widget to MSAA4. Previous behavior
corresponded to "off".

BUG=1459
R=robertphillips@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/21752002

git-svn-id: http://skia.googlecode.com/svn/trunk@10509 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 13:59:50 +00:00
humper@google.com
5a867c74e1 fix swapped bitmap channels on Mac for debugger
BUG=
R=djsollen@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/18485004

git-svn-id: http://skia.googlecode.com/svn/trunk@9958 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-10 15:53:36 +00:00
skia.committer@gmail.com
0d55dd7d2c Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9856 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-02 07:00:59 +00:00
bungeman@google.com
2ff6d1d1dc Separate showing and hiding the debugger settings and inspector.
Internally the settings and inspector in the debugger are separate, but the
inspector button toggles both of them. This is unfortunate, because both of
these have large minimum vertical sizes. This means that those with vertical
resolutions less than ~1024 cannot see the the details tab.

This change separates the settings and inspector toggles into two so that
the interface is usable on screens of smaller size.

R=robertphillips@google.com

Review URL: https://codereview.chromium.org/18279002

git-svn-id: http://skia.googlecode.com/svn/trunk@9835 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-01 14:24:12 +00:00
bungeman@google.com
0b4d6b289c Basic error checking for debugger GL widget.
Currently the debugger segfaults if the GL context cannot be created.
This change allows the debugger to build with GL support, but still run if the
GL context cannot be created at runtime.

R=robertphillips@google.com

Review URL: https://codereview.chromium.org/18275002

git-svn-id: http://skia.googlecode.com/svn/trunk@9834 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-01 13:54:10 +00:00
scroggo@google.com
f1754ec691 Replace SkPicture(SkStream) constructors with a factory.
SkPicture:
Remove the constructors which take an SkStream as an argument. Rather
than having to check a variable for success, the factory will return
NULL on failure.
Add a protected function for determining if an SkStream is an SKP
to share code with SkTimedPicture.
In the factory, check for a NULL SkStream.
Use a default decoder (from BUG:
https://code.google.com/p/skia/issues/detail?id=1325)

SkDebuggerGUI:
Call SkPicture::CreateFromStream when necessary.
Write a factory for creating SkTimedPictures and use it.

Use the factory throughout tools.

Add include/lazy to utils and effects gyp include_dirs so SkPicture.h
can reference SkImageDecoder.h which references SkBitmapFactory.h (in
include/lazy).

Changes code Chromium uses, so this will require a temporary Skia
and then a change to Chromium to use the new Skia code.

TODO: Create a decoder that does nothing to be used by pinspect,
lua pictures, etc, and allow it to not assert in SkOrderedReadBuffer.

R=reed@google.com

Review URL: https://codereview.chromium.org/17113004

git-svn-id: http://skia.googlecode.com/svn/trunk@9822 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-28 21:32:00 +00:00
fmalita@google.com
86681b37bd Expose debugger backend classes externally.
SkDebugCanvas & friends are useful beyond the Qt debugger app - Chromium's picture inspector (in development) is at the point where it could take advantage of it.

This patch moves SkDrawCommand, SkDebugCanvas & SkObjectParser from trunk/debugger to trunk/src/utils (since several tools already use these, this seems appropriate), and makes SkDrawCommand & SkDebugCanvas' symbols visible externally (SK_API).

R=reed@google.com

Review URL: https://codereview.chromium.org/16638014

git-svn-id: http://skia.googlecode.com/svn/trunk@9598 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-13 20:59:14 +00:00
skia.committer@gmail.com
a009083bd1 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9471 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-07 07:01:06 +00:00
robertphillips@google.com
6ede1fe62b Make SkDrawCommands lighter weight
https://codereview.chromium.org/15907023/



git-svn-id: http://skia.googlecode.com/svn/trunk@9470 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-06 23:59:28 +00:00
commit-bot@chromium.org
4a3ca94322 Update debugger for addition of Conic path verb
R=reed@google.com, djsollen@google.com

Author: robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/16224008

git-svn-id: http://skia.googlecode.com/svn/trunk@9438 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 21:51:06 +00:00
scroggo@google.com
7def5e1630 Separate core and images project.
SkImage calls functions on SkImageDecoder and SkImageEncoder. This
is desired behavior, and it is also desired to include SkImage as
a part of core. In order to keep core from depending on images,
update SkImageDecoder_empty.cpp to implement all of SkImageDecoder
and SkImageEncoder. This file will be built by chrome (in
https://codereview.chromium.org/15960015).

Move force_linking from SkImageDecoder.cpp to its own file. It must
be called to force linking with the image decoders if desired. Call
the function in tools that need it:
sk_image
render_pictures
render_pdfs
sk_hello
filter
bench_pictures
debugger

SkImageDecoder:
Derive from SkNoncopyable, instead of duplicating its
hiding of constructors.

skhello:
Return rather than trying to write a null SkData to the stream.

Revert "Hamfistedly removed core dependence on images"
(commit 0f05f682a90bc125323677abf3476e1027d174f5) and
"Move SkImage::encode to SkImage_Codec.cpp."
(commit 83e47a954d0bf65439f3d9c0c93213063dd70da3.)
These two commits were temporary fixes that this change
cleans up.

SkSnapshot.cpp:
Check for a NULL encoder returned by SkImageEncoder::Create.

BUG=https://code.google.com/p/skia/issues/detail?id=1275
R=djsollen@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/15806010

git-svn-id: http://skia.googlecode.com/svn/trunk@9364 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 14:00:10 +00:00
skia.committer@gmail.com
a5d3e77420 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9343 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-30 07:01:29 +00:00
robertphillips@google.com
0a4805e33f First pass at Comment API
https://codereview.chromium.org/13957009/



git-svn-id: http://skia.googlecode.com/svn/trunk@9310 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-29 13:24:23 +00:00
skia.committer@gmail.com
3e2345a8d5 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9266 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 07:01:26 +00:00
robertphillips@google.com
6d9c92b2f6 Remove offsetcanvas from debugger
https://codereview.chromium.org/15746003/



git-svn-id: http://skia.googlecode.com/svn/trunk@9253 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-23 13:21:18 +00:00
skia.committer@gmail.com
d2ada98934 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@8948 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-02 07:01:25 +00:00
scroggo@google.com
c4ebdb03de Force linking with image decoders for images project.
Previously, each tool that wanted to use image decoders
but did not specifically reference them had to create a
dummy function that references them in order to ensure
they are not stripped by the linker.

Instead of making each tool reference each image decoder,
do it once in SkImageDecoder.cpp. Now each tool will have
image decoders linked in, assuming it includes the images
project.

This fixes a bug where SKPs with encoded data could not
be read by bench_ or render_pictures.

R=djsollen@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/14678003

git-svn-id: http://skia.googlecode.com/svn/trunk@8941 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-01 21:17:27 +00:00
scroggo@google.com
aaec851ad1 Link webp in skimage and debugger.
Review URL: https://codereview.chromium.org/14103020

git-svn-id: http://skia.googlecode.com/svn/trunk@8691 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-15 22:05:03 +00:00
scroggo@google.com
81a51a2b4d Fix NaCl build.
In SkDebugger.cpp::forceLinking(), call CreateGIFDecoder on linux
but not on NaCl.

Review URL: https://codereview.chromium.org/13975008

git-svn-id: http://skia.googlecode.com/svn/trunk@8656 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-12 15:04:33 +00:00
scroggo@google.com
a53e946091 Force the debugger to link decoders.
This is required to play back SKPs with encoded data in them.

Review URL: https://codereview.chromium.org/14135004

git-svn-id: http://skia.googlecode.com/svn/trunk@8653 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-12 14:50:10 +00:00
robertphillips@google.com
50c84da68b Add getDrawCommandAt and setDrawCommandAt to SkDebugCanvas
https://codereview.chromium.org/13393005/



git-svn-id: http://skia.googlecode.com/svn/trunk@8462 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-01 18:18:49 +00:00
robertphillips@google.com
c3410b8cbb New filter targeted at desk_googlespreadsheet overdraw issues
https://codereview.chromium.org/12918029/



git-svn-id: http://skia.googlecode.com/svn/trunk@8424 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-28 12:25:25 +00:00
skia.committer@gmail.com
e60ed08a35 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-26 07:01:04 +00:00
robertphillips@google.com
77279cbf9b Fix compiler errors/warnings in r8355
git-svn-id: http://skia.googlecode.com/svn/trunk@8357 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 12:01:45 +00:00
robertphillips@google.com
0df2a9a829 SkDrawCommand cleanup
https://codereview.chromium.org/12989030/



git-svn-id: http://skia.googlecode.com/svn/trunk@8355 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-25 11:50:42 +00:00
skia.committer@gmail.com
7e32851d54 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8350 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-23 07:01:28 +00:00
robertphillips@google.com
24bfdac3f3 More SkDrawCommand cleanup
https://codereview.chromium.org/12634024/



git-svn-id: http://skia.googlecode.com/svn/trunk@8340 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-22 16:33:31 +00:00
robertphillips@google.com
a3a09ab1d5 More SkDrawCommand cleanup
https://codereview.chromium.org/12979004/



git-svn-id: http://skia.googlecode.com/svn/trunk@8328 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-22 12:25:30 +00:00
skia.committer@gmail.com
c76bb238de Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8186 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-18 07:01:03 +00:00
robertphillips@google.com
9105ad0f85 Add translate & scale optimizations
https://codereview.appspot.com/7571045/



git-svn-id: http://skia.googlecode.com/svn/trunk@8182 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-17 18:46:16 +00:00
robertphillips@google.com
91217d0b0c Making SkDrawCommand more robust
https://codereview.appspot.com/7486052/



git-svn-id: http://skia.googlecode.com/svn/trunk@8181 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-17 18:33:46 +00:00
skia.committer@gmail.com
91274b9972 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8120 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-13 07:01:04 +00:00
robertphillips@google.com
e428f9b113 Fix debugger build errors/warnings
https://codereview.appspot.com/7729045/



git-svn-id: http://skia.googlecode.com/svn/trunk@8105 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-12 15:33:40 +00:00
borenet@google.com
2d9dbd4f78 NaCl Debugger: Implement overview and filters, cleanup
(SkipBuildbotRuns) since no bots build the debugger.
Review URL: https://codereview.chromium.org/12449006

git-svn-id: http://skia.googlecode.com/svn/trunk@8095 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-12 13:07:40 +00:00
skia.committer@gmail.com
2e71f1619d Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8090 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-12 07:12:32 +00:00
robertphillips@google.com
febc0ec41b Add misc. optimizations to filter tool
https://codereview.appspot.com/7705043/



git-svn-id: http://skia.googlecode.com/svn/trunk@8087 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-11 22:53:11 +00:00
skia.committer@gmail.com
754a3eb73b Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8033 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-08 07:01:25 +00:00
bungeman@google.com
428fc4a37b Make debugger 'text' output less useless.
https://codereview.appspot.com/7588043/


git-svn-id: http://skia.googlecode.com/svn/trunk@8029 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-07 20:30:32 +00:00
robertphillips@google.com
20beb481ec Normalize the debugger's profile times by the repeat count
https://codereview.appspot.com/7520043/



git-svn-id: http://skia.googlecode.com/svn/trunk@8025 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-07 19:32:45 +00:00
scroggo@google.com
12d588a7f2 Remove bogus ability for creating an SkPicturePlayback to fail.
Change SkPicturePlayback::parseBufferTag to return void, since
it can never return false.

Change SkPicturePlayback::parseStreamTag to return void, since
the only way it can return false is if parseBufferTag returns
false, or if creating a sub picture failed, both of which are
nonsensical.

Due to the above, there is no reason for creating an
SkPicturePlayback to fail, so remove the isValid parameter.

Update subclasses in SkDebuggerGUI.

Review URL: https://codereview.appspot.com/7388050

git-svn-id: http://skia.googlecode.com/svn/trunk@7844 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-25 16:05:00 +00:00
scroggo@google.com
9f123162f7 Fix debugger build.
Review URL: https://codereview.appspot.com/7375050

git-svn-id: http://skia.googlecode.com/svn/trunk@7838 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-22 22:37:31 +00:00
scroggo@google.com
f8d7d27313 Create SkLazyPixelRef which performs lazy decoding.
The new pixel ref behaves similarly to SkImageRef, with some key differences:
It does not depend on the images project.
It requires an SkImageCache, which handles allocation and caching of the pixel
memory.
It takes a function signature for decoding which decodes into already allocated
pixel memory rather than into an SkBitmap.

Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache.

Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc,
and update sites that referenced it.

SkBitmapFactory now sets the pixel ref to a new object of the new
class SkLazyPixelRef, provided it has an SkImageCache for caching.

Provide an option to do lazy decodes in render_pictures and bench_pictures.

SkPicture:
Eliminate the default parameters in the constructor.
If a proc for decoding bitmaps is installed, use it to decode any encoded
data in subpictures.
When parsing deserializing subpictures, check for success.
When serializing subpictures, pass the picture's bitmap encoder to the
subpicture's call to serialize.

Update BitmapFactoryTest to test its new behavior.

BUG=https://code.google.com/p/skia/issues/detail?id=1008
BUG=https://code.google.com/p/skia/issues/detail?id=1009

Review URL: https://codereview.appspot.com/7060052

git-svn-id: http://skia.googlecode.com/svn/trunk@7835 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-22 21:38:35 +00:00
robertphillips@google.com
b94b1e781c Fix handling of setMatrix in debugger
https://codereview.appspot.com/7349047/



git-svn-id: http://skia.googlecode.com/svn/trunk@7785 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-19 21:00:26 +00:00
robertphillips@google.com
e4ce5b8262 Add NOOP "command" to picture format
https://codereview.appspot.com/7343044/



git-svn-id: http://skia.googlecode.com/svn/trunk@7752 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-15 17:19:15 +00:00
robertphillips@google.com
37a2b39ad1 Added SK_DEVELOPER wrapper's around toString calls in debugger's SkObjectParser
unreviewed



git-svn-id: http://skia.googlecode.com/svn/trunk@7733 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-14 14:40:27 +00:00
robertphillips@google.com
791f12e6cf Move SkPaint::toString from debugger to SkPaint
https://codereview.appspot.com/7314092/



git-svn-id: http://skia.googlecode.com/svn/trunk@7732 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-14 13:53:53 +00:00
skia.committer@gmail.com
3d18d063f0 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7730 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-14 07:01:34 +00:00
borenet@google.com
8825367ef0 Remove checked-in moc_* files
No longer needed since we generate these at build time.
Review URL: https://codereview.appspot.com/7322073

git-svn-id: http://skia.googlecode.com/svn/trunk@7726 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-13 21:06:01 +00:00