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

Unified Diff: gpu/command_buffer/service/program_manager.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « google_apis/google_api_keys.cc ('k') | ipc/ipc_channel_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager.cc
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index 747d1578edb88687267868eb1908e373638c7ad1..5c31f14cbdec716e8713e777a0c78b7db8a67b52 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -445,8 +445,8 @@ void ProgramManager::DoCompileShader(Shader* shader,
FeatureInfo* feature_info) {
TimeTicks before = TimeTicks::HighResNow();
if (program_cache_ &&
- program_cache_->GetShaderCompilationStatus(shader->source() ?
- *shader->source() : "") ==
+ program_cache_->GetShaderCompilationStatus(
+ shader->source() ? *shader->source() : std::string()) ==
ProgramCache::COMPILATION_SUCCEEDED) {
shader->SetStatus(true, "", translator);
shader->FlagSourceAsCompiled(false);
@@ -525,9 +525,9 @@ void ProgramManager::ForceCompileShader(const std::string* source,
LOG_IF(ERROR, translator)
<< "Shader translator allowed/produced an invalid shader "
<< "unless the driver is buggy:"
- << "\n--original-shader--\n" << (source ? *source : "")
- << "\n--translated-shader--\n" << shader_src
- << "\n--info-log--\n" << *shader->log_info();
+ << "\n--original-shader--\n" << (source ? *source : std::string())
+ << "\n--translated-shader--\n" << shader_src << "\n--info-log--\n"
+ << *shader->log_info();
}
}
« no previous file with comments | « google_apis/google_api_keys.cc ('k') | ipc/ipc_channel_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698