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

Unified Diff: Source/core/dom/Document.cpp

Issue 22893051: Add support for BeforeUnloadEvent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix test failures Created 7 years, 4 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 | « Source/core/dom/BeforeUnloadEvent.idl ('k') | Source/core/dom/Event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index 7bc3b65ad94ad57e797a296f45685f0f49f0658c..ab44b79ea82ef7e1207d259dd36c8a0134d86464 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -2341,7 +2341,7 @@ bool Document::dispatchBeforeUnloadEvent(Chrome& chrome, Document* navigatingDoc
m_loadEventProgress = BeforeUnloadEventCompleted;
if (!beforeUnloadEvent->defaultPrevented())
defaultEventHandler(beforeUnloadEvent.get());
- if (beforeUnloadEvent->result().isNull())
+ if (beforeUnloadEvent->returnValue().isNull())
return true;
if (navigatingDocument->m_didAllowNavigationViaBeforeUnloadConfirmationPanel) {
@@ -2349,7 +2349,7 @@ bool Document::dispatchBeforeUnloadEvent(Chrome& chrome, Document* navigatingDoc
return true;
}
- String text = displayStringModifiedByEncoding(beforeUnloadEvent->result());
+ String text = displayStringModifiedByEncoding(beforeUnloadEvent->returnValue());
if (chrome.runBeforeUnloadConfirmPanel(text, m_frame)) {
navigatingDocument->m_didAllowNavigationViaBeforeUnloadConfirmationPanel = true;
return true;
« no previous file with comments | « Source/core/dom/BeforeUnloadEvent.idl ('k') | Source/core/dom/Event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698