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/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 if (!new_size.IsEmpty()) { | 287 if (!new_size.IsEmpty()) { |
288 if (!is_accelerated_compositing_active_) { | 288 if (!is_accelerated_compositing_active_) { |
289 // Resize should have caused an invalidation of the entire view. | 289 // Resize should have caused an invalidation of the entire view. |
290 DCHECK(paint_aggregator_.HasPendingUpdate()); | 290 DCHECK(paint_aggregator_.HasPendingUpdate()); |
291 } | 291 } |
292 | 292 |
293 // Send the Resize_ACK flag once we paint again if requested. | 293 // Send the Resize_ACK flag once we paint again if requested. |
294 if (resize_ack == SEND_RESIZE_ACK) | 294 if (resize_ack == SEND_RESIZE_ACK) |
295 set_next_paint_is_resize_ack(); | 295 set_next_paint_is_resize_ack(); |
296 } | 296 } |
| 297 } else { |
| 298 resize_ack = NO_RESIZE_ACK; |
297 } | 299 } |
298 | 300 |
299 if (fullscreen_change) | 301 if (fullscreen_change) |
300 DidToggleFullscreen(); | 302 DidToggleFullscreen(); |
301 | 303 |
302 // If a resize ack is requested and it isn't set-up, then no more resizes will | 304 // If a resize ack is requested and it isn't set-up, then no more resizes will |
303 // come in and in general things will go wrong. | 305 // come in and in general things will go wrong. |
304 DCHECK(resize_ack != SEND_RESIZE_ACK || new_size.IsEmpty() || | 306 DCHECK(resize_ack != SEND_RESIZE_ACK || new_size.IsEmpty() || |
305 next_paint_is_resize_ack()); | 307 next_paint_is_resize_ack()); |
306 } | 308 } |
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1661 } | 1663 } |
1662 } | 1664 } |
1663 | 1665 |
1664 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { | 1666 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { |
1665 return false; | 1667 return false; |
1666 } | 1668 } |
1667 | 1669 |
1668 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { | 1670 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { |
1669 return false; | 1671 return false; |
1670 } | 1672 } |
OLD | NEW |