rename drawable to drawing for now, so we don't collide with animator

remove sk_throw in pixelref. a debug statement is enough.

git-svn-id: http://skia.googlecode.com/svn/trunk@136 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkDrawable.h b/include/core/SkDrawing.h
similarity index 100%
rename from include/core/SkDrawable.h
rename to include/core/SkDrawing.h

diff --git a/src/core/SkDrawable.cpp b/src/core/SkDrawing.cpp
similarity index 100%
rename from src/core/SkDrawable.cpp
rename to src/core/SkDrawing.cpp

diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index adfc3c0..e096d63 100644 (file)
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -66,10 +66,11 @@ uint32_t SkPixelRef::getGenerationID() const {
 }
 
 void SkPixelRef::notifyPixelsChanged() {
+#ifdef SK_DEBUG
     if (fIsImmutable) {
         SkDebugf("========== notifyPixelsChanged called on immutable pixelref");
-        sk_throw();
     }
+#endif
     // this signals us to recompute this next time around
     fGenerationID = 0;
 }

diff --git a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
index dcfaa36..24777c7 100644 (file)
--- a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
+++ b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
@@ -70,7 +70,6 @@
                00A41E4B0EFC312F00C9CBEB /* SampleArc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */; };
                0156F80407C56A3000C6122B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0156F80307C56A3000C6122B /* Foundation.framework */; };
                01FC44D507BD3BB800D228F4 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FC44D407BD3BB800D228F4 /* Quartz.framework */; };
-               2714E7960F7733EE00E95AE0 /* SkDrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2714E7950F7733EE00E95AE0 /* SkDrawable.cpp */; };
                8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
                8D0C4E8E0486CD37000505A6 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02345980000FD03B11CA0E72 /* main.nib */; };
                8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
@@ -190,7 +189,6 @@
                0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
                20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-               2714E7950F7733EE00E95AE0 /* SkDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkDrawable.cpp; path = ../../src/core/SkDrawable.cpp; sourceTree = SOURCE_ROOT; };
                32DBCF6D0370B57F00C91783 /* CICarbonSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CICarbonSample_Prefix.pch; sourceTree = "<group>"; };
                4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
                4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
@@ -333,7 +331,6 @@
                                002884490EFAA35C0083E387 /* core.xcodeproj */,
                                002884B40EFAB69F0083E387 /* maccore.xcodeproj */,
                                00003C8C0EFC230E000FF73A /* effects.xcodeproj */,
-                               2714E7950F7733EE00E95AE0 /* SkDrawable.cpp */,
                        );
                        name = CICarbonSample;
                        sourceTree = "<group>";
@@ -520,7 +517,6 @@
                                007C785E0F3B4C230004B142 /* SamplePathClip.cpp in Sources */,
                                009CC9190F65918A002185BE /* SampleFontScalerTest.cpp in Sources */,
                                007A7CB30F01658C00A2D6EE /* SamplePicture.cpp in Sources */,
-                               2714E7960F7733EE00E95AE0 /* SkDrawable.cpp in Sources */,
                                0041CE440F00A12400695E8C /* SampleLines.cpp in Sources */,
                                008C4D980F77DAEE0056981C /* SampleHairline.cpp in Sources */,
                        );