| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 } | 675 } |
| 676 | 676 |
| 677 void RenderWidget::DoDeferredUpdateAndSendInputAck() { | 677 void RenderWidget::DoDeferredUpdateAndSendInputAck() { |
| 678 DoDeferredUpdate(); | 678 DoDeferredUpdate(); |
| 679 | 679 |
| 680 if (pending_input_event_ack_.get()) | 680 if (pending_input_event_ack_.get()) |
| 681 Send(pending_input_event_ack_.release()); | 681 Send(pending_input_event_ack_.release()); |
| 682 } | 682 } |
| 683 | 683 |
| 684 void RenderWidget::DoDeferredUpdate() { | 684 void RenderWidget::DoDeferredUpdate() { |
| 685 // Sanity check for tests: |
| 686 TRACE_EVENT_INSTANT0("test_frame_rate_tests", "DoDeferredUpdate"); |
| 685 TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate"); | 687 TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate"); |
| 686 | 688 |
| 687 if (!webwidget_) | 689 if (!webwidget_) |
| 688 return; | 690 return; |
| 689 if (update_reply_pending()) { | 691 if (update_reply_pending()) { |
| 690 TRACE_EVENT0("renderer", "EarlyOut_UpdateReplyPending"); | 692 TRACE_EVENT0("renderer", "EarlyOut_UpdateReplyPending"); |
| 691 return; | 693 return; |
| 692 } | 694 } |
| 693 if (is_accelerated_compositing_active_ && | 695 if (is_accelerated_compositing_active_ && |
| 694 num_swapbuffers_complete_pending_ >= kMaxSwapBuffersPending) { | 696 num_swapbuffers_complete_pending_ >= kMaxSwapBuffersPending) { |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1386 | 1388 |
| 1387 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) { | 1389 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) { |
| 1388 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin(); | 1390 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin(); |
| 1389 i != plugin_window_moves_.end(); ++i) { | 1391 i != plugin_window_moves_.end(); ++i) { |
| 1390 if (i->window == window) { | 1392 if (i->window == window) { |
| 1391 plugin_window_moves_.erase(i); | 1393 plugin_window_moves_.erase(i); |
| 1392 break; | 1394 break; |
| 1393 } | 1395 } |
| 1394 } | 1396 } |
| 1395 } | 1397 } |
| OLD | NEW |