Disable rendering on up-scale.

BUG=116138


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

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

remoting/base/decoder_vp8.cc

@@ -121,6 +121,15 @@ void DecoderVp8::RenderFrame(const SkISize& view_size,
                              SkRegion* output_region) {
   SkIRect source_clip = SkIRect::MakeWH(last_image_->d_w, last_image_->d_h);
 
+  // ScaleYUVToRGB32WithRect doesn't support up-scaling, and our web-app never
+  // intentionally up-scales, so if we see up-scaling (e.g. during host resize
+  // or if the user applies page zoom) just don't render anything.
+  // TODO(wez): Remove this hack when ScaleYUVToRGB32WithRect can up-scale.
+  if (source_clip.width() < view_size.width() ||
+      source_clip.height() < view_size.height()) {
+    return;
+  }
+
   for (SkRegion::Iterator i(updated_region_); !i.done(); i.next()) {
     // Determine the scaled area affected by this rectangle changing.
     SkIRect rect = i.rect();

remoting/client/plugin/pepper_view.cc

@@ -139,19 +139,12 @@ void PepperView::SetConnectionState(protocol::ConnectionToHost::State state,
   }
 }
 
-void PepperView::SetView(const SkISize& view_size,
-                         const SkIRect& clip_area) {
+void PepperView::SetView(const SkISize& view_size, const SkIRect& clip_area) {
   bool view_changed = false;
 
-  // TODO(alexeypa): Prevent upscaling because the YUV-to-RGB conversion code
-  // currently does not support upscaling. Once it does, this code be removed.
-  SkISize size = SkISize::Make(
-                     std::min(view_size.width(), source_size_.width()),
-                     std::min(view_size.height(), source_size_.height()));
-
-  if (view_size_ != size) {
+  if (view_size_ != view_size) {
     view_changed = true;
-    view_size_ = size;
+    view_size_ = view_size;
 
     pp::Size pp_size = pp::Size(view_size_.width(), view_size_.height());
     graphics2d_ = pp::Graphics2D(instance_, pp_size, true);