| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 if (!next_paint_flags_ && | 1325 if (!next_paint_flags_ && |
| 1326 !need_update_rect_for_auto_resize_ && | 1326 !need_update_rect_for_auto_resize_ && |
| 1327 !plugin_window_moves_.size()) { | 1327 !plugin_window_moves_.size()) { |
| 1328 return; | 1328 return; |
| 1329 } | 1329 } |
| 1330 | 1330 |
| 1331 ViewHostMsg_UpdateRect_Params params; | 1331 ViewHostMsg_UpdateRect_Params params; |
| 1332 params.view_size = size_; | 1332 params.view_size = size_; |
| 1333 params.plugin_window_moves.swap(plugin_window_moves_); | 1333 params.plugin_window_moves.swap(plugin_window_moves_); |
| 1334 params.flags = next_paint_flags_; | 1334 params.flags = next_paint_flags_; |
| 1335 params.scroll_offset = GetScrollOffset(); | |
| 1336 params.scale_factor = device_scale_factor_; | |
| 1337 | 1335 |
| 1338 Send(new ViewHostMsg_UpdateRect(routing_id_, params)); | 1336 Send(new ViewHostMsg_UpdateRect(routing_id_, params)); |
| 1339 next_paint_flags_ = 0; | 1337 next_paint_flags_ = 0; |
| 1340 need_update_rect_for_auto_resize_ = false; | 1338 need_update_rect_for_auto_resize_ = false; |
| 1341 } | 1339 } |
| 1342 | 1340 |
| 1343 void RenderWidget::scheduleComposite() { | 1341 void RenderWidget::scheduleComposite() { |
| 1344 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 1342 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 1345 // render_thread may be NULL in tests. | 1343 // render_thread may be NULL in tests. |
| 1346 if (render_thread && render_thread->compositor_message_loop_proxy().get() && | 1344 if (render_thread && render_thread->compositor_message_loop_proxy().get() && |
| (...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2178 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2176 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2179 video_hole_frames_.AddObserver(frame); | 2177 video_hole_frames_.AddObserver(frame); |
| 2180 } | 2178 } |
| 2181 | 2179 |
| 2182 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2180 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2183 video_hole_frames_.RemoveObserver(frame); | 2181 video_hole_frames_.RemoveObserver(frame); |
| 2184 } | 2182 } |
| 2185 #endif // defined(VIDEO_HOLE) | 2183 #endif // defined(VIDEO_HOLE) |
| 2186 | 2184 |
| 2187 } // namespace content | 2185 } // namespace content |
| OLD | NEW |