Chromium Code Reviews| 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/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 658 DCHECK(resize_ack != SEND_RESIZE_ACK || !next_paint_is_resize_ack()); | 658 DCHECK(resize_ack != SEND_RESIZE_ACK || !next_paint_is_resize_ack()); |
| 659 DCHECK(resize_ack == SEND_RESIZE_ACK || resize_ack == NO_RESIZE_ACK); | 659 DCHECK(resize_ack == SEND_RESIZE_ACK || resize_ack == NO_RESIZE_ACK); |
| 660 } | 660 } |
| 661 | 661 |
| 662 // Ignore this during shutdown. | 662 // Ignore this during shutdown. |
| 663 if (!webwidget_) | 663 if (!webwidget_) |
| 664 return; | 664 return; |
| 665 | 665 |
| 666 if (compositor_) { | 666 if (compositor_) { |
| 667 compositor_->setViewportSize(new_size, physical_backing_size); | 667 compositor_->setViewportSize(new_size, physical_backing_size); |
| 668 compositor_->SetTopControlsLayoutHeight(top_controls_layout_height); | 668 compositor_->SetTopControlsContentOffset(top_controls_layout_height); |
|
aelias_OOO_until_Jul13
2014/08/29 04:37:01
This isn't quite what I had in mind and it's impos
bokan
2014/08/29 18:02:14
Ack...I think I introduced some confusion here by
| |
| 669 } | 669 } |
| 670 | 670 |
| 671 physical_backing_size_ = physical_backing_size; | 671 physical_backing_size_ = physical_backing_size; |
| 672 top_controls_layout_height_ = top_controls_layout_height; | 672 top_controls_layout_height_ = top_controls_layout_height; |
| 673 visible_viewport_size_ = visible_viewport_size; | 673 visible_viewport_size_ = visible_viewport_size; |
| 674 resizer_rect_ = resizer_rect; | 674 resizer_rect_ = resizer_rect; |
| 675 | 675 |
| 676 // NOTE: We may have entered fullscreen mode without changing our size. | 676 // NOTE: We may have entered fullscreen mode without changing our size. |
| 677 bool fullscreen_change = is_fullscreen_ != is_fullscreen; | 677 bool fullscreen_change = is_fullscreen_ != is_fullscreen; |
| 678 if (fullscreen_change) | 678 if (fullscreen_change) |
| (...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2178 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2178 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2179 video_hole_frames_.AddObserver(frame); | 2179 video_hole_frames_.AddObserver(frame); |
| 2180 } | 2180 } |
| 2181 | 2181 |
| 2182 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2182 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2183 video_hole_frames_.RemoveObserver(frame); | 2183 video_hole_frames_.RemoveObserver(frame); |
| 2184 } | 2184 } |
| 2185 #endif // defined(VIDEO_HOLE) | 2185 #endif // defined(VIDEO_HOLE) |
| 2186 | 2186 |
| 2187 } // namespace content | 2187 } // namespace content |
| OLD | NEW |