Part 2/3 (GL) of adding with device scale factor to transport surfaces

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index b2aa5a1b8193beb348c8caf8b28ab5af1c13936c..af70e839974dee110d6178eebbed2ffdec23f846 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -561,7 +561,7 @@ class GLES2DecoderImpl : public GLES2Decoder {
   virtual void PerformIdleWork() OVERRIDE;
 
   virtual void SetResizeCallback(
-      const base::Callback<void(gfx::Size)>& callback) OVERRIDE;
+      const base::Callback<void(gfx::Size, float)>& callback) OVERRIDE;
 
   virtual Logger* GetLogger() OVERRIDE;
   virtual ErrorState* GetErrorState() OVERRIDE;
@@ -1626,7 +1626,7 @@ class GLES2DecoderImpl : public GLES2Decoder {
 
   scoped_ptr<VertexArrayManager> vertex_array_manager_;
 
-  base::Callback<void(gfx::Size)> resize_callback_;
+  base::Callback<void(gfx::Size, float)> resize_callback_;
 
   WaitSyncPointCallback wait_sync_point_callback_;
 
@@ -3023,7 +3023,7 @@ void GLES2DecoderImpl::UpdateParentTextureInfo() {
 }
 
 void GLES2DecoderImpl::SetResizeCallback(
-    const base::Callback<void(gfx::Size)>& callback) {
+    const base::Callback<void(gfx::Size, float)>& callback) {
   resize_callback_ = callback;
 }
 
@@ -3428,6 +3428,7 @@ error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(
 
   GLuint width = static_cast<GLuint>(c.width);
   GLuint height = static_cast<GLuint>(c.height);
+  GLfloat scale_factor = static_cast<GLuint>(c.scale_factor);

[piman, 2013/05/22 19:41:14]

static_cast<GLuint> is certainly wrong.
I think you don't need a cast at all.

[ccameron, 2013/05/22 20:00:06]

Ooof, embarrassing. Thanks -- done!

   TRACE_EVENT2("gpu", "glResizeChromium", "width", width, "height", height);
 
   width = std::max(1U, width);
@@ -3448,7 +3449,7 @@ error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(
   }
 
   if (!resize_callback_.is_null()) {
-    resize_callback_.Run(gfx::Size(width, height));
+    resize_callback_.Run(gfx::Size(width, height), scale_factor);
     DCHECK(context_->IsCurrent(surface_.get()));
     if (!context_->IsCurrent(surface_.get())) {
       LOG(ERROR) << "GLES2DecoderImpl: Context lost because context no longer "