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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/ChromeClientImpl.cpp

Issue 1176843006: Move window.close implementation to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Cleanup some leftover changes. Created 5 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 side-by-side diff with in-line comments
Download patch
« Source/core/frame/DOMWindow.cpp ('K') | « Source/core/frame/RemoteDOMWindow.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ChromeClientImpl.cpp
diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp
index 4bddb6895087221ce4122e4d24d4d5edbcb7bdab..8c95171e40ba90838dd0c6c61b551812d4db2da8 100644
--- a/Source/web/ChromeClientImpl.cpp
+++ b/Source/web/ChromeClientImpl.cpp
@@ -400,7 +400,8 @@ void ChromeClientImpl::closeWindowSoon()
Page::ordinaryPages().remove(m_webView->page());
// Make sure that all loading is stopped. Ensures that JS stops executing!
- m_webView->mainFrame()->stopLoading();
+ if (m_webView->mainFrame()->isWebLocalFrame())
+ m_webView->mainFrame()->stopLoading();
dcheng 2015/06/16 20:08:23 Oof. We'll need to fix this too.
nasko 2015/06/16 22:58:54 I didn't get to this one today :(. I will fix it o
if (m_webView->client())
m_webView->client()->closeWidgetSoon();
« Source/core/frame/DOMWindow.cpp ('K') | « Source/core/frame/RemoteDOMWindow.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698