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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2172083002: Do not discard screen info in RenderViewImpl::OnDisableAutoResize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2418 matching lines...) Expand 10 before | Expand all | Expand 10 after
2429 2429
2430 void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) { 2430 void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) {
2431 DCHECK(disable_scrollbars_size_limit_.IsEmpty()); 2431 DCHECK(disable_scrollbars_size_limit_.IsEmpty());
2432 if (!webview()) 2432 if (!webview())
2433 return; 2433 return;
2434 auto_resize_mode_ = false; 2434 auto_resize_mode_ = false;
2435 webview()->disableAutoResizeMode(); 2435 webview()->disableAutoResizeMode();
2436 2436
2437 if (!new_size.IsEmpty()) { 2437 if (!new_size.IsEmpty()) {
2438 ResizeParams resize_params; 2438 ResizeParams resize_params;
2439 resize_params.screen_info = screen_info_;
2439 resize_params.new_size = new_size; 2440 resize_params.new_size = new_size;
2440 resize_params.physical_backing_size = physical_backing_size_; 2441 resize_params.physical_backing_size = physical_backing_size_;
2441 resize_params.top_controls_shrink_blink_size = 2442 resize_params.top_controls_shrink_blink_size =
2442 top_controls_shrink_blink_size_; 2443 top_controls_shrink_blink_size_;
2443 resize_params.top_controls_height = top_controls_height_; 2444 resize_params.top_controls_height = top_controls_height_;
2444 resize_params.visible_viewport_size = visible_viewport_size_; 2445 resize_params.visible_viewport_size = visible_viewport_size_;
2445 resize_params.resizer_rect = resizer_rect_; 2446 resize_params.resizer_rect = resizer_rect_;
2446 resize_params.is_fullscreen_granted = is_fullscreen_granted(); 2447 resize_params.is_fullscreen_granted = is_fullscreen_granted();
2447 resize_params.display_mode = display_mode_; 2448 resize_params.display_mode = display_mode_;
2448 resize_params.needs_resize_ack = false; 2449 resize_params.needs_resize_ack = false;
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
3101 return render_frame->focused_pepper_plugin(); 3102 return render_frame->focused_pepper_plugin();
3102 } 3103 }
3103 frame = frame->traverseNext(false); 3104 frame = frame->traverseNext(false);
3104 } 3105 }
3105 3106
3106 return nullptr; 3107 return nullptr;
3107 } 3108 }
3108 #endif 3109 #endif
3109 3110
3110 } // namespace content 3111 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698