aura/cc: clip webkit layer size to external texture dimensions

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 267 matching lines @@
     }
     web_layer_ = new_layer;
     web_layer_is_accelerated_ = true;
     for (size_t i = 0; i < children_.size(); ++i) {
       DCHECK(!children_[i]->web_layer_.isNull());
       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();
   WebKit::WebExternalTextureLayer texture_layer =
       web_layer_.to<WebKit::WebExternalTextureLayer>();
   texture_layer.setFlipped(texture_cc->flipped());
   RecomputeDrawsContentAndUVRect();
 #endif
 }
@@ skipping 332 matching lines @@
   bounds_ = bounds;
   if (IsDrawn()) {
     if (was_move)
       ScheduleDraw();
     else
       SchedulePaint(gfx::Rect(bounds.size()));
   }
 
   SetNeedsToRecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
-  web_layer_.setBounds(bounds.size());
   RecomputeTransform();
   RecomputeDrawsContentAndUVRect();
 #endif
 }
 
 void Layer::SetTransformImmediately(const ui::Transform& transform) {
   transform_ = transform;
 
   SetNeedsToRecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
@@ skipping 61 matching lines @@
   transform.ConcatTranslate(bounds_.x(), bounds_.y());
   web_layer_.setTransform(transform.matrix());
 }
 
 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);
+    web_layer_.setBounds(bounds_.size());
   } else {
     DCHECK(texture_);
     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);
+    gfx::Size size(std::min(bounds_.width(), texture_cc->size().width()),
+                   std::min(bounds_.height(), texture_cc->size().height()));
     WebKit::WebFloatRect rect(
         0,
         0,
-        static_cast<float>(bounds_.width())/texture_cc->size().width(),
-        static_cast<float>(bounds_.height())/texture_cc->size().height());
+        static_cast<float>(size.width())/texture_cc->size().width(),
+        static_cast<float>(size.height())/texture_cc->size().height());
     texture_layer.setUVRect(rect);
+    web_layer_.setBounds(size);
   }
 }
 #endif
 
 }  // namespace ui