Clean up some Skia logging stuff. This unfortunately doesn't re-enable it for

the reasons mentioned in the TODO. But I made it work much better when it is
enabled.
Review URL: http://codereview.chromium.org/17394

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8019 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 23 insertions, 20 deletions

diff --git a/skia/ext/google_logging.cc b/skia/ext/google_logging.cc
index c69d873..72328b8 100644
--- a/skia/ext/google_logging.cc
+++ b/skia/ext/google_logging.cc
@@ -1,20 +1,23 @@
-// Copyright (c) 2009 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.

-

-// This file provides integration with Google-style "base/logging.h" assertions

-// for Skia SkASSERT. If you don't want this, you can link with another file

-// that provides integration with the logging of your choice.

-

-#include "base/logging.h"

-#include "base/string_util.h"

-

-void SkDebugf_FileLine(const char* file, int line, const char* format, ...) {

-  va_list ap;

-  va_start(ap, format);

-

-  std::string msg;

-  StringAppendV(&msg, format, ap);

-

-  logging::LogMessage(file, line, logging::LOG_ERROR).stream() << msg;

-}

+// Copyright (c) 2009 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.
+
+// This file provides integration with Google-style "base/logging.h" assertions
+// for Skia SkASSERT. If you don't want this, you can link with another file
+// that provides integration with the logging of your choice.
+
+#include "base/logging.h"
+#include "base/string_util.h"
+
+void SkDebugf_FileLine(const char* file, int line, bool fatal,
+                       const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+
+  std::string msg;
+  StringAppendV(&msg, format, ap);
+
+  logging::LogMessage(file, line,
+                      fatal ? logging::LOG_FATAL : logging::LOG_INFO).stream()
+      << msg;
+}