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

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

Issue 7003092: Revert 88547 - Initialize RenderWidget's compositing_surface_ to NULL. (ARM bustage) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 has_focus_(false), 81 has_focus_(false),
82 handling_input_event_(false), 82 handling_input_event_(false),
83 closing_(false), 83 closing_(false),
84 is_swapped_out_(false), 84 is_swapped_out_(false),
85 input_method_is_active_(false), 85 input_method_is_active_(false),
86 text_input_type_(WebKit::WebTextInputTypeNone), 86 text_input_type_(WebKit::WebTextInputTypeNone),
87 popup_type_(popup_type), 87 popup_type_(popup_type),
88 pending_window_rect_count_(0), 88 pending_window_rect_count_(0),
89 suppress_next_char_events_(false), 89 suppress_next_char_events_(false),
90 is_accelerated_compositing_active_(false), 90 is_accelerated_compositing_active_(false),
91 compositing_surface_(NULL),
92 animation_update_pending_(false), 91 animation_update_pending_(false),
93 animation_task_posted_(false), 92 animation_task_posted_(false),
94 invalidation_task_posted_(false) { 93 invalidation_task_posted_(false) {
95 RenderProcess::current()->AddRefProcess(); 94 RenderProcess::current()->AddRefProcess();
96 DCHECK(render_thread_); 95 DCHECK(render_thread_);
97 has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch( 96 has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
98 switches::kDisableGpuVsync); 97 switches::kDisableGpuVsync);
99 } 98 }
100 99
101 RenderWidget::~RenderWidget() { 100 RenderWidget::~RenderWidget() {
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 1351
1353 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) { 1352 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
1354 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin(); 1353 for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
1355 i != plugin_window_moves_.end(); ++i) { 1354 i != plugin_window_moves_.end(); ++i) {
1356 if (i->window == window) { 1355 if (i->window == window) {
1357 plugin_window_moves_.erase(i); 1356 plugin_window_moves_.erase(i);
1358 break; 1357 break;
1359 } 1358 }
1360 } 1359 }
1361 } 1360 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698