Prepend the log prefix everywhere

gpu/command_buffer/service/logger.cc

 // Copyright (c) 2013 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.
 
 #include "gpu/command_buffer/service/logger.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "gpu/command_buffer/common/debug_marker_manager.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 
 namespace gpu {
 namespace gles2 {
 
 Logger::Logger(const DebugMarkerManager* debug_marker_manager)
     : debug_marker_manager_(debug_marker_manager),
       log_message_count_(0),
       log_synthesized_gl_errors_(true) {
   Logger* this_temp = this;
-  this_in_hex_ = base::HexEncode(&this_temp, sizeof(this_temp));
+  this_in_hex_ = std::string("GroupMarkerNotSet(crbug.com/242999)!:") +
+      base::HexEncode(&this_temp, sizeof(this_temp));
 }
 
 Logger::~Logger() {}
 
 void Logger::LogMessage(
     const char* filename, int line, const std::string& msg) {
   if (log_message_count_ < kMaxLogMessages ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGLErrorLimit)) {
+    std::string prefixed_msg(std::string("[") + GetLogPrefix() + "]" + msg);
     ++log_message_count_;
     // LOG this unless logging is turned off as any chromium code that
     // generates these errors probably has a bug.
     if (log_synthesized_gl_errors_) {
       ::logging::LogMessage(
-          filename, line, ::logging::LOG_ERROR).stream() << msg;
+          filename, line, ::logging::LOG_ERROR).stream() << prefixed_msg;
     }
     if (!msg_callback_.is_null()) {
-      msg_callback_.Run(0, msg);
+      msg_callback_.Run(0, prefixed_msg);
     }
   } else {
     if (log_message_count_ == kMaxLogMessages) {
       ++log_message_count_;
       LOG(ERROR)
           << "Too many GL errors, not reporting any more for this context."
           << " use --disable-gl-error-limit to see all errors.";
     }
   }
 }
 
 const std::string& Logger::GetLogPrefix() const {
   const std::string& prefix(debug_marker_manager_->GetMarker());
   return prefix.empty() ? this_in_hex_ : prefix;
 }
 
 void Logger::SetMsgCallback(const MsgCallback& callback) {
   msg_callback_ = callback;
 }
 
 }  // namespace gles2
 }  // namespace gpu