Upstream the pagescalefactor fix for plugin placeholder on android

webkit/plugins/webview_plugin.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_WEBVIEW_PLUGIN_H_
 #define WEBKIT_PLUGINS_WEBVIEW_PLUGIN_H_
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 125 matching lines @@
   // version, so we implement this method and call the default in WebFrameClient
   // (which does nothing) to correctly overload it.
   virtual void didReceiveResponse(WebKit::WebFrame* frame,
                                   unsigned identifier,
                                   const WebKit::WebURLResponse& response);
 
  private:
   friend class base::DeleteHelper<WebViewPlugin>;
   virtual ~WebViewPlugin();
 
+  // Get the scale factor for the current page.
+  float GetPageScaleFactor();
+
   Delegate* delegate_;
   // Destroys itself.
   WebKit::WebCursorInfo current_cursor_;
   // Owns us.
   WebKit::WebPluginContainer* container_;
   // Owned by us, deleted via |close()|.
   WebKit::WebView* web_view_;
   gfx::Rect rect_;
 
   WebKit::WebURLResponse response_;
   std::list<std::string> data_;
   bool finished_loading_;
   scoped_ptr<WebKit::WebURLError> error_;
   WebKit::WebString old_title_;
 };
 
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_WEBVIEW_PLUGIN_H_