Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2035)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 257963003: Remove scroll_offset argument from MovePluginWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index ad374246f96ac5d750fb9703868bb584f8262ff5..0738fa99e6cdfd1b3b8d017b0d065a08f062f93d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -762,7 +762,6 @@ RenderFrameHostImpl* RenderWidgetHostViewAura::GetFocusedFrame() {
}
void RenderWidgetHostViewAura::MovePluginWindows(
- const gfx::Vector2d& scroll_offset,
const std::vector<WebPluginGeometry>& plugin_window_moves) {
#if defined(OS_WIN)
// We need to clip the rectangle to the tab's viewport, otherwise we will draw
@@ -775,13 +774,12 @@ void RenderWidgetHostViewAura::MovePluginWindows(
gfx::Rect view_bounds = window_->GetBoundsInRootWindow();
std::vector<WebPluginGeometry> moves = plugin_window_moves;
- gfx::Rect view_port(scroll_offset.x(), scroll_offset.y(), view_bounds.width(),
- view_bounds.height());
+ gfx::Rect view_port(view_bounds.size());
for (size_t i = 0; i < moves.size(); ++i) {
gfx::Rect clip(moves[i].clip_rect);
gfx::Vector2d view_port_offset(
- moves[i].window_rect.OffsetFromOrigin() + scroll_offset);
+ moves[i].window_rect.OffsetFromOrigin());
clip.Offset(view_port_offset);
jbauman 2014/04/25 23:42:35 This was just offsetting both clip and view_port b
clip.Intersect(view_port);
clip.Offset(-view_port_offset);

Powered by Google App Engine
This is Rietveld 408576698