BrowserPlugin: Grab the correct viewsize to report to BrowserPluginGuestDelegate

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
@@ skipping 304 matching lines @@
     uint32 output_surface_id,
     int host_process_id,
     int host_routing_id,
     scoped_ptr<cc::CompositorFrame> frame) {
   if (!attached()) {
     // If the guest doesn't have an embedder then there's nothing to give the
     // the frame to.
     return;
   }
 
-  gfx::Size view_size(frame->metadata.root_layer_size.width(),
-                      frame->metadata.root_layer_size.height());
+  cc::RenderPass* root_pass =
+      frame->delegated_frame_data->render_pass_list.back();
+  gfx::Size view_size(root_pass->output_rect.size());
   if (last_seen_view_size_ != view_size) {
     delegate_->GuestSizeChanged(last_seen_view_size_, view_size);
     last_seen_view_size_ = view_size;
   }
 
   base::SharedMemoryHandle software_frame_handle =
       base::SharedMemory::NULLHandle();
   if (frame->software_frame_data) {
     cc::SoftwareFrameData* frame_data = frame->software_frame_data.get();
     scoped_ptr<cc::SharedBitmap> bitmap =
@@ skipping 554 matching lines @@
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
 }  // namespace content