Upstream the pagescalefactor fix for plugin placeholder on android

Upstream the pagescalefactor fix for plugin placeholder on android

Currently webview_plugin.cc does not take pagescalefactor into consideration and plugin placeholders are rendered incorrectly.
As the webkit passes in window coordinates, we need to convert it back to the content coordinates so that the place holder will be sized correctly.
This change should only affect platforms where pagescalefactor is being used.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=168444

[qinmin, 2012-11-14 02:47:57]

PTAL

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

I'm not really familiar with this code. bauerb created this. adding him as a
reviewer, and you have my lgtm based on his.

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin.cc
File webkit/plugins/webview_plugin.cc (right):

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:130: float pageScaleFactor = 1.0f;
nit: google style is page_scale_factor. if you can update above to paint_rect
that'd be good too. also ditto below

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

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin.cc
File webkit/plugins/webview_plugin.cc (right):

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:133: ->pageScaleFactor();
Urgh. Could you extract something in here to a local variable?

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:137: ceil(static_cast<float>(content_scale *
paintRect.x())),
Why do we need the static_cast here? Shouldn't float * int be float?

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:161: view()->pageScaleFactor();
Same "urgh" here. Maybe you could (also) pull it out into a method?

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

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin.cc
File webkit/plugins/webview_plugin.cc (right):

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:130: float pageScaleFactor = 1.0f;
On 2012/11/14 20:59:55, John Abd-El-Malek wrote:
> nit: google style is page_scale_factor. if you can update above to paint_rect
> that'd be good too. also ditto below

Done.

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:133: ->pageScaleFactor();
On 2012/11/14 21:12:00, Bernhard Bauer wrote:
> Urgh. Could you extract something in here to a local variable?

Done.

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:137: ceil(static_cast<float>(content_scale *
paintRect.x())),
On 2012/11/14 21:12:00, Bernhard Bauer wrote:
> Why do we need the static_cast here? Shouldn't float * int be float?

removed.

https://codereview.chromium.org/11359200/diff/1/webkit/plugins/webview_plugin...
webkit/plugins/webview_plugin.cc:161: view()->pageScaleFactor();
On 2012/11/14 21:12:00, Bernhard Bauer wrote:
> Same "urgh" here. Maybe you could (also) pull it out into a method?

Done. added a GetPageScaleFactor() method

[qinmin, 2012-11-16 18:15:55]

ping. Bernhard, is this good to go now?

[Bernhard Bauer, 2012-11-16 18:33:33]

Oh, sorry. LGTM!

[qinmin, 2012-11-16 18:35:39]

On 2012/11/16 18:33:33, Bernhard Bauer wrote:
> Oh, sorry. LGTM!

thank you

[commit-bot: I haz the power, 2012-11-16 18:36:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/11359200/7001

[commit-bot: I haz the power, 2012-11-16 18:36:56]

Presubmit check for 11359200-7001 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit Messages **
If this change has an associated bug, add BUG=[bug number].

** Presubmit Warnings **
Your #include order seems to be broken. Send mail to
marja@chromium.org if this is not the case.
      webkit/plugins/webview_plugin.cc:12

Presubmit checks took 1.2s to calculate.

[commit-bot: I haz the power, 2012-11-16 18:45:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/11359200/11002

[commit-bot: I haz the power, 2012-11-17 14:13:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/11359200/11002

[commit-bot: I haz the power, 2012-11-17 15:53:08]

Change committed as 168444