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 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1106 next_selection_range_.reset(); | 1112 next_selection_range_.reset(); |
1107 | 1113 |
1108 // Must reset these to ensure that gesture events work with a new renderer. | 1114 // Must reset these to ensure that gesture events work with a new renderer. |
1109 gesture_event_filter_->Reset(); | 1115 gesture_event_filter_->Reset(); |
1110 | 1116 |
1111 // Must reset these to ensure that keyboard events work with a new renderer. | 1117 // Must reset these to ensure that keyboard events work with a new renderer. |
1112 key_queue_.clear(); | 1118 key_queue_.clear(); |
1113 suppress_next_char_events_ = false; | 1119 suppress_next_char_events_ = false; |
1114 | 1120 |
1115 // Reset some fields in preparation for recovering from a crash. | 1121 // Reset some fields in preparation for recovering from a crash. |
1116 resize_ack_pending_ = false; | 1122 ResetSizeAndRepaintPendingFlags(); |
1117 repaint_ack_pending_ = false; | |
1118 | |
1119 in_flight_size_.SetSize(0, 0); | |
1120 current_size_.SetSize(0, 0); | 1123 current_size_.SetSize(0, 0); |
1121 is_hidden_ = false; | 1124 is_hidden_ = false; |
1122 is_accelerated_compositing_active_ = false; | 1125 is_accelerated_compositing_active_ = false; |
1123 | 1126 |
1124 // Reset this to ensure the hung renderer mechanism is working properly. | 1127 // Reset this to ensure the hung renderer mechanism is working properly. |
1125 in_flight_event_count_ = 0; | 1128 in_flight_event_count_ = 0; |
1126 | 1129 |
1127 if (view_) { | 1130 if (view_) { |
1128 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_, | 1131 GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_, |
1129 gfx::GLSurfaceHandle()); | 1132 gfx::GLSurfaceHandle()); |
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2042 // indicate that no callback is in progress (i.e. without this line | 2045 // indicate that no callback is in progress (i.e. without this line |
2043 // DelayedAutoResized will not get called again). | 2046 // DelayedAutoResized will not get called again). |
2044 new_auto_size_.SetSize(0, 0); | 2047 new_auto_size_.SetSize(0, 0); |
2045 if (!should_auto_resize_) | 2048 if (!should_auto_resize_) |
2046 return; | 2049 return; |
2047 | 2050 |
2048 OnRenderAutoResized(new_size); | 2051 OnRenderAutoResized(new_size); |
2049 } | 2052 } |
2050 | 2053 |
2051 } // namespace content | 2054 } // namespace content |
OLD | NEW |