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/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 Loading... |
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::ResetSizeAndRepaintPendingFlags() { |
| 239 resize_ack_pending_ = false; |
| 240 repaint_ack_pending_ = false; |
| 241 in_flight_size_.SetSize(0, 0); |
| 242 } |
| 243 |
238 void RenderWidgetHostImpl::Init() { | 244 void RenderWidgetHostImpl::Init() { |
239 DCHECK(process_->HasConnection()); | 245 DCHECK(process_->HasConnection()); |
240 | 246 |
241 renderer_initialized_ = true; | 247 renderer_initialized_ = true; |
242 | 248 |
243 GpuSurfaceTracker::Get()->SetSurfaceHandle( | 249 GpuSurfaceTracker::Get()->SetSurfaceHandle( |
244 surface_id_, GetCompositingSurface()); | 250 surface_id_, GetCompositingSurface()); |
245 | 251 |
246 // Send the ack along with the information on placement. | 252 // Send the ack along with the information on placement. |
247 Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId())); | 253 Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId())); |
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1104 next_selection_range_.reset(); | 1110 next_selection_range_.reset(); |
1105 | 1111 |
1106 // Must reset these to ensure that gesture events work with a new renderer. | 1112 // Must reset these to ensure that gesture events work with a new renderer. |
1107 gesture_event_filter_->Reset(); | 1113 gesture_event_filter_->Reset(); |
1108 | 1114 |
1109 // Must reset these to ensure that keyboard events work with a new renderer. | 1115 // Must reset these to ensure that keyboard events work with a new renderer. |
1110 key_queue_.clear(); | 1116 key_queue_.clear(); |
1111 suppress_next_char_events_ = false; | 1117 suppress_next_char_events_ = false; |
1112 | 1118 |
1113 // Reset some fields in preparation for recovering from a crash. | 1119 // Reset some fields in preparation for recovering from a crash. |
1114 resize_ack_pending_ = false; | 1120 ResetSizeAndRepaintPendingFlags(); |
1115 repaint_ack_pending_ = false; | |
1116 | |
1117 in_flight_size_.SetSize(0, 0); | |
1118 current_size_.SetSize(0, 0); | 1121 current_size_.SetSize(0, 0); |
1119 is_hidden_ = false; | 1122 is_hidden_ = false; |
1120 is_accelerated_compositing_active_ = false; | 1123 is_accelerated_compositing_active_ = false; |
1121 | 1124 |
1122 // Reset this to ensure the hung renderer mechanism is working properly. | 1125 // Reset this to ensure the hung renderer mechanism is working properly. |
1123 in_flight_event_count_ = 0; | 1126 in_flight_event_count_ = 0; |
1124 | 1127 |
1125 if (view_) { | 1128 if (view_) { |
1126 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_, | 1129 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_, |
1127 gfx::GLSurfaceHandle()); | 1130 gfx::GLSurfaceHandle()); |
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2051 // indicate that no callback is in progress (i.e. without this line | 2054 // indicate that no callback is in progress (i.e. without this line |
2052 // DelayedAutoResized will not get called again). | 2055 // DelayedAutoResized will not get called again). |
2053 new_auto_size_.SetSize(0, 0); | 2056 new_auto_size_.SetSize(0, 0); |
2054 if (!should_auto_resize_) | 2057 if (!should_auto_resize_) |
2055 return; | 2058 return; |
2056 | 2059 |
2057 OnRenderAutoResized(new_size); | 2060 OnRenderAutoResized(new_size); |
2058 } | 2061 } |
2059 | 2062 |
2060 } // namespace content | 2063 } // namespace content |
OLD | NEW |