Fix TexSubImage2D and CompressedTexSubImage2D to check that format and type

match the texture they are going to update.

Also fix the info_log and source stuff so they handle NULL strings
vs empty strings.

TEST=unit tests and ran gles2 conformance tests
BUG=71135,71073,71109

Review URL: http://codereview.chromium.org/6250036

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

1 files changed, 6 insertions, 5 deletions

diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
index ab51bf1..f3088d6 100644
--- a/gpu/command_buffer/service/program_manager.h
+++ b/gpu/command_buffer/service/program_manager.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 
@@ -137,12 +138,12 @@ class ProgramManager {
 
     bool CanLink() const;
 
-    const std::string& log_info() const {
-      return log_info_;
+    const std::string* log_info() const {
+      return log_info_.get();
     }
 
-    void set_log_info(const std::string& str) {
-      log_info_ = str;
+    void set_log_info(const char* str) {
+      log_info_.reset(str ? new std::string(str) : NULL);
     }
 
     bool InUse() const {
@@ -216,7 +217,7 @@ class ProgramManager {
     bool link_status_;
 
     // Log info
-    std::string log_info_;
+    scoped_ptr<std::string> log_info_;
   };
 
   ProgramManager();