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

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

Issue 2044683002: Prevent crash when resize is sent to a swapped out main frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 2662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 void RenderViewImpl::ResizeWebWidget() { 2673 void RenderViewImpl::ResizeWebWidget() {
2674 webview()->resizeWithTopControls(GetSizeForWebWidget(), 2674 webview()->resizeWithTopControls(GetSizeForWebWidget(),
2675 top_controls_height_, 2675 top_controls_height_,
2676 top_controls_shrink_blink_size_); 2676 top_controls_shrink_blink_size_);
2677 } 2677 }
2678 2678
2679 void RenderViewImpl::OnResize(const ResizeParams& params) { 2679 void RenderViewImpl::OnResize(const ResizeParams& params) {
2680 TRACE_EVENT0("renderer", "RenderViewImpl::OnResize"); 2680 TRACE_EVENT0("renderer", "RenderViewImpl::OnResize");
2681 if (webview()) { 2681 if (webview()) {
2682 webview()->hidePopups(); 2682 webview()->hidePopups();
2683 if (send_preferred_size_changes_) { 2683 if (send_preferred_size_changes_ &&
2684 webview()->mainFrame()->isWebLocalFrame()) {
2684 webview()->mainFrame()->setCanHaveScrollbars( 2685 webview()->mainFrame()->setCanHaveScrollbars(
2685 ShouldDisplayScrollbars(params.new_size.width(), 2686 ShouldDisplayScrollbars(params.new_size.width(),
2686 params.new_size.height())); 2687 params.new_size.height()));
2687 } 2688 }
2688 if (display_mode_ != params.display_mode) { 2689 if (display_mode_ != params.display_mode) {
2689 display_mode_ = params.display_mode; 2690 display_mode_ = params.display_mode;
2690 webview()->setDisplayMode(display_mode_); 2691 webview()->setDisplayMode(display_mode_);
2691 } 2692 }
2692 } 2693 }
2693 2694
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
3391 return render_frame->focused_pepper_plugin(); 3392 return render_frame->focused_pepper_plugin();
3392 } 3393 }
3393 frame = frame->traverseNext(false); 3394 frame = frame->traverseNext(false);
3394 } 3395 }
3395 3396
3396 return nullptr; 3397 return nullptr;
3397 } 3398 }
3398 #endif 3399 #endif
3399 3400
3400 } // namespace content 3401 } // 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