Upstream the pagescalefactor fix for plugin placeholder on android

webkit/plugins/webview_plugin.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 "webkit/plugins/webview_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webpreferences.h"
 
@@ skipping 97 matching lines @@
   return false;
 }
 
 void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
   gfx::Rect paintRect = gfx::IntersectRects(rect_, rect);
   if (paintRect.IsEmpty())
     return;
 
   paintRect.Offset(-rect_.x(), -rect_.y());
 
+  float pageScaleFactor = 1.0f;

[jam, 2012/11/14 20:59:55]

nit: google style is page_scale_factor. if you can update above to paint_rect
that'd be good too. also ditto below

[qinmin, 2012/11/14 22:16:59]

Done.

+  if (container_) {
+    pageScaleFactor = container_->element().document().frame()->top()->view()
+        ->pageScaleFactor();

[Bernhard Bauer, 2012/11/14 21:12:00]

Urgh. Could you extract something in here to a local variable?

[qinmin, 2012/11/14 22:16:59]

Done.

+  }
+  float content_scale = 1.0f / pageScaleFactor;
+  paintRect.SetRect(
+      ceil(static_cast<float>(content_scale * paintRect.x())),

[Bernhard Bauer, 2012/11/14 21:12:00]

Why do we need the static_cast here? Shouldn't float * int be float?

[qinmin, 2012/11/14 22:16:59]

removed.

+      ceil(static_cast<float>(content_scale * paintRect.y())),
+      ceil(static_cast<float>(content_scale * paintRect.width())),
+      ceil(static_cast<float>(content_scale * paintRect.height())));
+
   canvas->translate(SkIntToScalar(rect_.x()), SkIntToScalar(rect_.y()));
   canvas->save();
 
   web_view_->layout();
   web_view_->paint(canvas, paintRect);
 
   canvas->restore();
 }
 
 // Coordinates are relative to the containing window.
 void WebViewPlugin::updateGeometry(
     const WebRect& frame_rect, const WebRect& clip_rect,
     const WebVector<WebRect>& cut_out_rects, bool is_visible) {
   if (static_cast<gfx::Rect>(frame_rect) != rect_) {
     rect_ = frame_rect;
-    web_view_->resize(WebSize(frame_rect.width, frame_rect.height));
+
+    float pageScaleFactor = 1.0f;
+    if (container_) {
+      pageScaleFactor = container_->element().document().frame()->top()->
+          view()->pageScaleFactor();

[Bernhard Bauer, 2012/11/14 21:12:00]

Same "urgh" here. Maybe you could (also) pull it out into a method?

[qinmin, 2012/11/14 22:16:59]

Done. added a GetPageScaleFactor() method

+    }
+    float content_scale = 1.0f / pageScaleFactor;
+
+    web_view_->resize(WebSize(content_scale * frame_rect.width,
+                              content_scale * frame_rect.height));
   }
 }
 
 bool WebViewPlugin::acceptsInputEvents() {
   return true;
 }
 
 bool WebViewPlugin::handleInputEvent(const WebInputEvent& event,
                                      WebCursorInfo& cursor) {
   if (event.type == WebInputEvent::ContextMenu) {
@@ skipping 78 matching lines @@
   return error;
 }
 
 void WebViewPlugin::didReceiveResponse(WebFrame* frame,
                                        unsigned identifier,
                                        const WebURLResponse& response) {
   WebFrameClient::didReceiveResponse(frame, identifier, response);
 }
 
 }  // namespace webkit