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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 613043005: OOPIF: Check whether localFrameRootTemporary is valid when processing resizing messages (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index f5c464c3868c939b6152106cc43bfa9f8d9bca5b..761dc41775b2ea9473c89ef5b9428050bc5385f2 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -1712,7 +1712,11 @@ void WebViewImpl::setTopControlsLayoutHeight(float height)
void WebViewImpl::didUpdateTopControls()
{
- FrameView* view = localFrameRootTemporary()->frameView();
+ WebLocalFrameImpl* localFrameRoot = localFrameRootTemporary();
+ if (!localFrameRoot)
+ return;
+
+ FrameView* view = localFrameRoot->frameView();
if (!view)
return;
@@ -1729,7 +1733,13 @@ void WebViewImpl::resize(const WebSize& newSize)
if (m_shouldAutoResize || m_size == newSize)
return;
- FrameView* view = localFrameRootTemporary()->frameView();
+ // FIXME: if a remote frame is swapped back in, it may have the wrong
+ // sizing.
kenrb 2014/10/10 19:20:21 I don't think this is a valid concern. Size messag
+ WebLocalFrameImpl* localFrameRoot = localFrameRootTemporary();
+ if (!localFrameRoot)
+ return;
+
+ FrameView* view = localFrameRoot->frameView();
if (!view)
return;
« 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