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

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 36 matching lines @@
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/sandbox_init_wrapper.h"
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #endif
 #if defined(OS_MACOSX)
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #endif
+#include "skia/include/corecg/SkTypes.h"
 
 extern int BrowserMain(const MainFunctionParams&);
 extern int RendererMain(const MainFunctionParams&);
 extern int PluginMain(const MainFunctionParams&);
 extern int WorkerMain(const MainFunctionParams&);
 
 #if defined(OS_WIN)
 // TODO(erikkay): isn't this already defined somewhere?
 #define DLLEXPORT __declspec(dllexport)
 
@@ skipping 30 matching lines @@
                       const wchar_t* file, unsigned int line,
                       uintptr_t reserved) {
   __debugbreak();
 }
 
 void PureCall() {
   __debugbreak();
 }
 
 int OnNoMemory(size_t memory_size) {
+  // Skia indicates that it can safely handle some NULL allocs by clearing
+  // this flag.  In this case, we'll ignore the new_handler and won't crash.
+  if (!sk_malloc_will_throw()) {
+      return;
+  }
+
   __debugbreak();
   // Return memory_size so it is not optimized out. Make sure the return value
   // is at least 1 so malloc/new is retried, especially useful when under a
   // debugger.
   return memory_size ? static_cast<int>(memory_size) : 1;
 }
 
 // Handlers to silently dump the current process when there is an assert in
 // chrome.
 void ChromeAssert(const std::string& str) {
@@ skipping 293 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif
 
   logging::CleanupChromeLogging();
 
   return rv;
 }