| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 bool ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate(LocalFrame* frame, c
onst String& message, bool isReload) | 401 bool ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate(LocalFrame* frame, c
onst String& message, bool isReload) |
| 402 { | 402 { |
| 403 notifyPopupOpeningObservers(); | 403 notifyPopupOpeningObservers(); |
| 404 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame); | 404 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame); |
| 405 return webframe->client() && webframe->client()->runModalBeforeUnloadDialog(
isReload, message); | 405 return webframe->client() && webframe->client()->runModalBeforeUnloadDialog(
isReload, message); |
| 406 } | 406 } |
| 407 | 407 |
| 408 void ChromeClientImpl::closeWindowSoon() | 408 void ChromeClientImpl::closeWindowSoon() |
| 409 { | 409 { |
| 410 // Make sure this Page can no longer be found by JS. | 410 // Make sure this Page can no longer be found by JS. |
| 411 Page::ordinaryPages().remove(m_webView->page()); | 411 m_webView->page()->willBeClosed(); |
| 412 | 412 |
| 413 // Make sure that all loading is stopped. Ensures that JS stops executing! | 413 // Make sure that all loading is stopped. Ensures that JS stops executing! |
| 414 m_webView->mainFrame()->stopLoading(); | 414 m_webView->mainFrame()->stopLoading(); |
| 415 | 415 |
| 416 if (m_webView->client()) | 416 if (m_webView->client()) |
| 417 m_webView->client()->closeWidgetSoon(); | 417 m_webView->client()->closeWidgetSoon(); |
| 418 } | 418 } |
| 419 | 419 |
| 420 // Although a LocalFrame is passed in, we don't actually use it, since we | 420 // Although a LocalFrame is passed in, we don't actually use it, since we |
| 421 // already know our own m_webView. | 421 // already know our own m_webView. |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1027 if (m_webView->pageImportanceSignals()) | 1027 if (m_webView->pageImportanceSignals()) |
| 1028 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); | 1028 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler() | 1031 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler() |
| 1032 { | 1032 { |
| 1033 return m_webView->scheduler()->createFrameScheduler().release(); | 1033 return m_webView->scheduler()->createFrameScheduler().release(); |
| 1034 } | 1034 } |
| 1035 | 1035 |
| 1036 } // namespace blink | 1036 } // namespace blink |
| OLD | NEW |