diff options
| author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 02:48:21 +0000 |
|---|---|---|
| committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 02:48:21 +0000 |
| commit | 1869a3a242a0f0645764d84ea3ab4750556810a1 (patch) | |
| tree | 499dd5e401476ff2cb53bd859e3fdbdfa6eac551 /gpu | |
| parent | 1d8e794e4d5351f978db6d8dc9b148c2ebd8423f (diff) | |
| download | chromium_src-1869a3a242a0f0645764d84ea3ab4750556810a1.zip chromium_src-1869a3a242a0f0645764d84ea3ab4750556810a1.tar.gz chromium_src-1869a3a242a0f0645764d84ea3ab4750556810a1.tar.bz2 | |
Allow |msg| to be NULL
CID=103608
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9836135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index b7b72a7..2519ba0 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -622,7 +622,8 @@ void GLES2Implementation::SetGLError(GLenum error, const char* msg) { last_error_ = msg; } if (error_message_callback_) { - std::string temp(GLES2Util::GetStringError(error) + " : " + msg); + std::string temp(GLES2Util::GetStringError(error) + " : " + + (msg ? msg : "")); error_message_callback_->OnErrorMessage(temp.c_str(), 0); } error_bits_ |= GLES2Util::GLErrorToErrorBit(error); |