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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser
Patch Set: sync + Address Albert's comments. Created 8 years, 3 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
OLDNEW
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/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return view_->GetCompositingSurface(); 228 return view_->GetCompositingSurface();
229 return gfx::GLSurfaceHandle(); 229 return gfx::GLSurfaceHandle();
230 } 230 }
231 231
232 void RenderWidgetHostImpl::CompositingSurfaceUpdated() { 232 void RenderWidgetHostImpl::CompositingSurfaceUpdated() {
233 GpuSurfaceTracker::Get()->SetSurfaceHandle( 233 GpuSurfaceTracker::Get()->SetSurfaceHandle(
234 surface_id_, GetCompositingSurface()); 234 surface_id_, GetCompositingSurface());
235 process_->SurfaceUpdated(surface_id_); 235 process_->SurfaceUpdated(surface_id_);
236 } 236 }
237 237
238 void RenderWidgetHostImpl::ResetFlags() {
239 // Must reset these to ensure that mouse move/wheel events work with a new
240 // renderer.
241 mouse_move_pending_ = false;
242 next_mouse_move_.reset();
243 mouse_wheel_pending_ = false;
244 coalesced_mouse_wheel_events_.clear();
245
246 // Must reset these to ensure that SelectRange works with a new renderer.
247 select_range_pending_ = false;
248 next_selection_range_.reset();
249
250 // Must reset these to ensure that gesture events work with a new renderer.
251 gesture_event_filter_->Reset();
252
253 // Must reset these to ensure that keyboard events work with a new renderer.
254 key_queue_.clear();
255 suppress_next_char_events_ = false;
256
257 // Reset some fields in preparation for recovering from a crash.
258 resize_ack_pending_ = false;
259 repaint_ack_pending_ = false;
260
261 in_flight_size_.SetSize(0, 0);
262 current_size_.SetSize(0, 0);
263 is_hidden_ = false;
264 is_accelerated_compositing_active_ = false;
265
266 // Reset this to ensure the hung renderer mechanism is working properly.
267 in_flight_event_count_ = 0;
268 }
269
238 void RenderWidgetHostImpl::Init() { 270 void RenderWidgetHostImpl::Init() {
239 DCHECK(process_->HasConnection()); 271 DCHECK(process_->HasConnection());
240 272
241 renderer_initialized_ = true; 273 renderer_initialized_ = true;
242 274
243 GpuSurfaceTracker::Get()->SetSurfaceHandle( 275 GpuSurfaceTracker::Get()->SetSurfaceHandle(
244 surface_id_, GetCompositingSurface()); 276 surface_id_, GetCompositingSurface());
245 277
246 // Send the ack along with the information on placement. 278 // Send the ack along with the information on placement.
247 Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId())); 279 Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId()));
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 base::TimeDelta interval) { 1119 base::TimeDelta interval) {
1088 Send(new ViewMsg_UpdateVSyncParameters(GetRoutingID(), timebase, interval)); 1120 Send(new ViewMsg_UpdateVSyncParameters(GetRoutingID(), timebase, interval));
1089 } 1121 }
1090 1122
1091 void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status, 1123 void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
1092 int exit_code) { 1124 int exit_code) {
1093 // Clearing this flag causes us to re-create the renderer when recovering 1125 // Clearing this flag causes us to re-create the renderer when recovering
1094 // from a crashed renderer. 1126 // from a crashed renderer.
1095 renderer_initialized_ = false; 1127 renderer_initialized_ = false;
1096 1128
1097 // Must reset these to ensure that mouse move/wheel events work with a new 1129 ResetFlags();
1098 // renderer.
1099 mouse_move_pending_ = false;
1100 next_mouse_move_.reset();
1101 mouse_wheel_pending_ = false;
1102 coalesced_mouse_wheel_events_.clear();
1103
1104 // Must reset these to ensure that SelectRange works with a new renderer.
1105 select_range_pending_ = false;
1106 next_selection_range_.reset();
1107
1108 // Must reset these to ensure that gesture events work with a new renderer.
1109 gesture_event_filter_->Reset();
1110
1111 // Must reset these to ensure that keyboard events work with a new renderer.
1112 key_queue_.clear();
1113 suppress_next_char_events_ = false;
1114
1115 // Reset some fields in preparation for recovering from a crash.
1116 resize_ack_pending_ = false;
1117 repaint_ack_pending_ = false;
1118
1119 in_flight_size_.SetSize(0, 0);
1120 current_size_.SetSize(0, 0);
1121 is_hidden_ = false;
1122 is_accelerated_compositing_active_ = false;
1123
1124 // Reset this to ensure the hung renderer mechanism is working properly.
1125 in_flight_event_count_ = 0;
1126 1130
1127 if (view_) { 1131 if (view_) {
1128 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_, 1132 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_,
1129 gfx::GLSurfaceHandle()); 1133 gfx::GLSurfaceHandle());
1130 view_->RenderViewGone(status, exit_code); 1134 view_->RenderViewGone(status, exit_code);
1131 view_ = NULL; // The View should be deleted by RenderViewGone. 1135 view_ = NULL; // The View should be deleted by RenderViewGone.
1132 } 1136 }
1133 1137
1134 BackingStoreManager::RemoveBackingStore(this); 1138 BackingStoreManager::RemoveBackingStore(this);
1135 } 1139 }
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 // indicate that no callback is in progress (i.e. without this line 2046 // indicate that no callback is in progress (i.e. without this line
2043 // DelayedAutoResized will not get called again). 2047 // DelayedAutoResized will not get called again).
2044 new_auto_size_.SetSize(0, 0); 2048 new_auto_size_.SetSize(0, 0);
2045 if (!should_auto_resize_) 2049 if (!should_auto_resize_)
2046 return; 2050 return;
2047 2051
2048 OnRenderAutoResized(new_size); 2052 OnRenderAutoResized(new_size);
2049 } 2053 }
2050 2054
2051 } // namespace content 2055 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698