aura/cc: Fix accelerated content size

ui/gfx/compositor/layer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 261 matching lines @@
       web_layer_.addChild(children_[i]->web_layer_);
     }
     web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
     web_layer_.setOpaque(fills_bounds_opaquely_);
     web_layer_.setOpacity(visible_ ? opacity_ : 0.f);
     web_layer_.setBounds(bounds_.size());
     RecomputeTransform();
   }
   TextureCC* texture_cc = static_cast<TextureCC*>(texture);
   texture_cc->Update();
-  web_layer_.to<WebKit::WebExternalTextureLayer>().setFlipped(
-      texture_cc->flipped());
-  RecomputeDrawsContent();
+  WebKit::WebExternalTextureLayer texture_layer =
+      web_layer_.to<WebKit::WebExternalTextureLayer>();
+  texture_layer.setFlipped(texture_cc->flipped());
+  RecomputeDrawsContentAndUVRect();
 #endif
 }
 
 void Layer::SetCanvas(const SkCanvas& canvas, const gfx::Point& origin) {
 #if defined(USE_WEBKIT_COMPOSITOR)
   NOTREACHED();
 #else
   DCHECK_EQ(type_, LAYER_HAS_TEXTURE);
 
   if (!texture_.get())
@@ skipping 175 matching lines @@
     // Ensure we have the largest hole.
     if (candidate_hole.size().GetArea() > hole_rect_.size().GetArea())
       hole_rect_ = candidate_hole;
   }
 
   // Free up texture memory if the hole fills bounds of layer.
   if (!ShouldDraw() && !layer_updated_externally_)
     texture_ = NULL;
 
 #if defined(USE_WEBKIT_COMPOSITOR)
-  RecomputeDrawsContent();
+  RecomputeDrawsContentAndUVRect();
 #endif
 }
 
 bool Layer::IsCompletelyOpaque() const {
   return fills_bounds_opaquely() && GetCombinedOpacity() == 1.0f;
 }
 
 // static
 void Layer::PunchHole(const gfx::Rect& rect,
                       const gfx::Rect& region_to_punch_out,
@@ skipping 80 matching lines @@
       ScheduleDraw();
     else
       SchedulePaint(gfx::Rect(bounds.size()));
   }
 
   if (parent())
     parent()->RecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
   web_layer_.setBounds(bounds.size());
   RecomputeTransform();
-  RecomputeDrawsContent();
+  RecomputeDrawsContentAndUVRect();
 #endif
 }
 
 void Layer::SetTransformImmediately(const ui::Transform& transform) {
   transform_ = transform;
 
   if (parent())
     parent()->RecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
   RecomputeTransform();
@@ skipping 56 matching lines @@
 float Layer::GetOpacityForAnimation() const {
   return opacity();
 }
 
 #if defined(USE_WEBKIT_COMPOSITOR)
 void Layer::CreateWebLayer() {
   web_layer_ = WebKit::WebContentLayer::create(this, this);
   web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
   web_layer_.setOpaque(true);
   web_layer_is_accelerated_ = false;
-  RecomputeDrawsContent();
+  RecomputeDrawsContentAndUVRect();
 }
 
 void Layer::RecomputeTransform() {
   ui::Transform transform = transform_;
   transform.ConcatTranslate(bounds_.x(), bounds_.y());
   web_layer_.setTransform(transform.matrix());
 }
 
-void Layer::RecomputeDrawsContent() {
+void Layer::RecomputeDrawsContentAndUVRect() {
   DCHECK(!web_layer_.isNull());
   bool should_draw = type_ == LAYER_HAS_TEXTURE &&
       !hole_rect_.Contains(gfx::Rect(gfx::Point(0, 0), bounds_.size()));
   if (!web_layer_is_accelerated_) {
     web_layer_.to<WebKit::WebContentLayer>().setDrawsContent(should_draw);
   } else {
     DCHECK(texture_);
-#if defined(USE_WEBKIT_COMPOSITOR)
-    unsigned int texture_id =
-        static_cast<TextureCC*>(texture_.get())->texture_id();
-#else
-    unsigned int texture_id = 0;
-#endif
-    web_layer_.to<WebKit::WebExternalTextureLayer>().setTextureId(
-        should_draw ? texture_id : 0);
+    TextureCC* texture_cc = static_cast<TextureCC*>(texture_.get());
+    unsigned int texture_id = texture_cc->texture_id();
+    WebKit::WebExternalTextureLayer texture_layer =
+        web_layer_.to<WebKit::WebExternalTextureLayer>();
+    texture_layer.setTextureId(should_draw ? texture_id : 0);
+    WebKit::WebFloatRect rect(
+        0,
+        0,
+        static_cast<float>(bounds_.width())/texture_cc->size().width(),
+        static_cast<float>(bounds_.height())/texture_cc->size().height());
+    texture_layer.setUVRect(rect);
   }
 }
 #endif
 
 }  // namespace ui