aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-03-24 18:47:35 +0000
committerGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-03-24 18:47:35 +0000
commit3eab80cc1f2031b582b37aed6176e1f8df67b72f (patch)
tree800a8e656a4c2874e501743ebe1bde7bde81af80 /src
parent6c14b43a840c791699747ba4cc0ed5abf2bda218 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/core/SkDrawing.cpp (renamed from src/core/SkDrawable.cpp)0
-rw-r--r--src/core/SkPixelRef.cpp3
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkDrawable.cpp b/src/core/SkDrawing.cpp
index 85f3175bdb..85f3175bdb 100644
--- a/src/core/SkDrawable.cpp
+++ b/src/core/SkDrawing.cpp
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index adfc3c02e9..e096d634b1 100644
--- 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;
}