Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Side by Side Diff: gpu/command_buffer/service/logger.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/logger.h" 5 #include "gpu/command_buffer/service/logger.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "gpu/command_buffer/common/debug_marker_manager.h" 10 #include "gpu/command_buffer/common/debug_marker_manager.h"
11 #include "gpu/command_buffer/service/gpu_switches.h" 11 #include "gpu/command_buffer/service/gpu_switches.h"
12 12
13 namespace gpu { 13 namespace gpu {
14 namespace gles2 { 14 namespace gles2 {
15 15
16 Logger::Logger(const DebugMarkerManager* debug_marker_manager) 16 Logger::Logger(const DebugMarkerManager* debug_marker_manager)
17 : debug_marker_manager_(debug_marker_manager), 17 : debug_marker_manager_(debug_marker_manager),
18 log_message_count_(0), 18 log_message_count_(0),
19 log_synthesized_gl_errors_(true) { 19 log_synthesized_gl_errors_(true) {
20 Logger* this_temp = this; 20 Logger* this_temp = this;
21 this_in_hex_ = std::string("GroupMarkerNotSet(crbug.com/242999)!:") + 21 this_in_hex_ = std::string("GroupMarkerNotSet(crbug.com/242999)!:") +
22 base::HexEncode(&this_temp, sizeof(this_temp)); 22 base::HexEncode(&this_temp, sizeof(this_temp));
23 } 23 }
24 24
25 Logger::~Logger() {} 25 Logger::~Logger() {}
26 26
27 void Logger::LogMessage( 27 void Logger::LogMessage(
28 const char* filename, int line, const std::string& msg) { 28 const char* filename, int line, const std::string& msg) {
29 if (log_message_count_ < kMaxLogMessages || 29 if (log_message_count_ < kMaxLogMessages ||
30 CommandLine::ForCurrentProcess()->HasSwitch( 30 base::CommandLine::ForCurrentProcess()->HasSwitch(
31 switches::kDisableGLErrorLimit)) { 31 switches::kDisableGLErrorLimit)) {
32 std::string prefixed_msg(std::string("[") + GetLogPrefix() + "]" + msg); 32 std::string prefixed_msg(std::string("[") + GetLogPrefix() + "]" + msg);
33 ++log_message_count_; 33 ++log_message_count_;
34 // LOG this unless logging is turned off as any chromium code that 34 // LOG this unless logging is turned off as any chromium code that
35 // generates these errors probably has a bug. 35 // generates these errors probably has a bug.
36 if (log_synthesized_gl_errors_) { 36 if (log_synthesized_gl_errors_) {
37 ::logging::LogMessage( 37 ::logging::LogMessage(
38 filename, line, ::logging::LOG_ERROR).stream() << prefixed_msg; 38 filename, line, ::logging::LOG_ERROR).stream() << prefixed_msg;
39 } 39 }
40 if (!msg_callback_.is_null()) { 40 if (!msg_callback_.is_null()) {
(...skipping 14 matching lines...) Expand all
55 return prefix.empty() ? this_in_hex_ : prefix; 55 return prefix.empty() ? this_in_hex_ : prefix;
56 } 56 }
57 57
58 void Logger::SetMsgCallback(const MsgCallback& callback) { 58 void Logger::SetMsgCallback(const MsgCallback& callback) {
59 msg_callback_ = callback; 59 msg_callback_ = callback;
60 } 60 }
61 61
62 } // namespace gles2 62 } // namespace gles2
63 } // namespace gpu 63 } // namespace gpu
64 64
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc ('k') | gpu/command_buffer/service/memory_program_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698