commit e1ac2e8430b502974a4a7c65989381763cab1b10
author Derek Sollenberger <djsollen@google.com> Tue Jan 22 09:26:52 2013 -0500
committer Derek Sollenberger <djsollen@google.com> Tue Jan 22 09:26:52 2013 -0500
tree 5071bce0efa28c23fbcf02f8bf494185ade42ba8
parent cfceaa81654c0b02a693e29d2763ef1540e55647

Fixes needed to run Skia in debug mode

Change-Id: I420c812b34ba41a3fc03db1f1276340954d379c1

src/core/SkLanguage.cpp

diff --git a/src/core/SkLanguage.cpp b/src/core/SkLanguage.cpp
index 3b8ba3c..2d0bcd5 100644
--- a/src/core/SkLanguage.cpp
+++ b/src/core/SkLanguage.cpp
@@ -16,7 +16,6 @@
 
 SkLanguage SkLanguage::getParent() const {
     SkASSERT(fInfo != NULL);
-    SkASSERT(fInfo->fTag != NULL);
     const char* tag = fInfo->fTag.c_str();
     SkASSERT(tag != NULL);
 

src/ports/SkImageRef_ashmem.cpp

diff --git a/src/ports/SkImageRef_ashmem.cpp b/src/ports/SkImageRef_ashmem.cpp
index 46ebb0d..f9c6aff 100644
--- a/src/ports/SkImageRef_ashmem.cpp
+++ b/src/ports/SkImageRef_ashmem.cpp
@@ -41,8 +41,6 @@
     fRec.fPinned = false;
             
     fCT = NULL;
-            
-    this->useDefaultMutex();   // we don't need/want the shared imageref mutex
 }
 
 SkImageRef_ashmem::~SkImageRef_ashmem() {
@@ -237,7 +235,6 @@
         buffer.read(buf, length);
         setURI(buf, length);
     }
-    this->useDefaultMutex();   // we don't need/want the shared imageref mutex
 }
 
 SkPixelRef* SkImageRef_ashmem::Create(SkFlattenableReadBuffer& buffer) {