Merge 14891 - A better fix for http://www.crbug.com/2044: crash...

skia/include/corecg/SkTypes.h

Index: skia/include/corecg/SkTypes.h
===================================================================
--- skia/include/corecg/SkTypes.h	(revision 14820)
+++ skia/include/corecg/SkTypes.h	(working copy)
@@ -65,6 +65,11 @@
 */
 extern void  sk_free(void*);
 
+/** Returns whether sk_malloc() will currently throw.  Only false during
+    a call to sk_malloc_flags() with SK_MALLOC_THROW not set.  This is
+    useful to mallocs that would otherwise abort on NULL themselves.
+    false indicates that skia will safely handle NULL checking.  **/
+extern bool  sk_malloc_will_throw();
 ///////////////////////////////////////////////////////////////////////
 
 #define SK_INIT_TO_AVOID_WARNING    = 0
Property changes on: skia\include\corecg\SkTypes.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/skia/include/corecg/SkTypes.h:r69-2775
   Merged /trunk/src/skia/include/corecg/SkTypes.h:r14891