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

Side by Side Diff: chrome/renderer/render_widget.cc

Issue 6551019: Trace_event upgrades (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More gooder js thanks to arv. Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_widget.h" 5 #include "chrome/renderer/render_widget.h"
6 6
7 #include "app/surface/transport_dib.h" 7 #include "app/surface/transport_dib.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/debug/trace_event.h"
10 #include "base/message_loop.h" 11 #include "base/message_loop.h"
11 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
12 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/render_messages.h" 16 #include "chrome/common/render_messages.h"
16 #include "chrome/common/render_messages_params.h" 17 #include "chrome/common/render_messages_params.h"
17 #include "chrome/renderer/render_process.h" 18 #include "chrome/renderer/render_process.h"
18 #include "chrome/renderer/render_thread.h" 19 #include "chrome/renderer/render_thread.h"
19 #include "chrome/renderer/renderer_webkitclient_impl.h" 20 #include "chrome/renderer/renderer_webkitclient_impl.h"
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 } 526 }
526 527
527 void RenderWidget::CallDoDeferredUpdate() { 528 void RenderWidget::CallDoDeferredUpdate() {
528 DoDeferredUpdate(); 529 DoDeferredUpdate();
529 530
530 if (pending_input_event_ack_.get()) 531 if (pending_input_event_ack_.get())
531 Send(pending_input_event_ack_.release()); 532 Send(pending_input_event_ack_.release());
532 } 533 }
533 534
534 void RenderWidget::DoDeferredUpdate() { 535 void RenderWidget::DoDeferredUpdate() {
536 TRACE_EVENT0("GPU_INFO", "RenderWidget::DoDeferredUpdate");
535 if (!webwidget_ || update_reply_pending()) 537 if (!webwidget_ || update_reply_pending())
536 return; 538 return;
537 539
538 // Suppress updating when we are hidden. 540 // Suppress updating when we are hidden.
539 if (is_hidden_ || size_.IsEmpty()) { 541 if (is_hidden_ || size_.IsEmpty()) {
540 paint_aggregator_.ClearPendingUpdate(); 542 paint_aggregator_.ClearPendingUpdate();
541 needs_repainting_on_restore_ = true; 543 needs_repainting_on_restore_ = true;
542 return; 544 return;
543 } 545 }
544 546
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 1090
1089 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) { 1091 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
1090 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin(); 1092 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
1091 i != plugin_window_moves_.end(); ++i) { 1093 i != plugin_window_moves_.end(); ++i) {
1092 if (i->window == window) { 1094 if (i->window == window) {
1093 plugin_window_moves_.erase(i); 1095 plugin_window_moves_.erase(i);
1094 break; 1096 break;
1095 } 1097 }
1096 } 1098 }
1097 } 1099 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698