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/gyp@9822 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/effects.gyp b/effects.gyp
index 91458eb..d69c820 100644
--- a/effects.gyp
+++ b/effects.gyp
@@ -1,3 +1,4 @@
+# Gyp file for effects
{
'targets': [
{
@@ -12,6 +13,7 @@
'../include/config',
'../include/core',
'../include/effects',
+ '../include/lazy',
'../include/utils',
'../src/core',
],
diff --git a/utils.gyp b/utils.gyp
index 4ac9284..1b51b18 100644
--- a/utils.gyp
+++ b/utils.gyp
@@ -1,3 +1,4 @@
+# Gyp for utils.
{
'targets': [
{
@@ -10,6 +11,7 @@
'../include/core',
'../include/effects',
'../include/images',
+ '../include/lazy',
'../include/pipe',
'../include/utils',
'../include/utils/mac',
