PlzNavigate: properly execute BeforeUnload on renderer initiated navigations

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index e702d8156f4ef366a7a13832a6a2f6287b3935bf..8c222bf8eab63ef8cde93be0b89988d2a57aa471 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -687,13 +687,6 @@ WebPerformance WebLocalFrameImpl::performance() const
     return WebPerformance(DOMWindowPerformance::performance(*(frame()->domWindow())));
 }
 
-bool WebLocalFrameImpl::dispatchBeforeUnloadEvent()
-{
-    if (!frame())
-        return true;
-    return frame()->loader().shouldClose();
-}
-
 void WebLocalFrameImpl::dispatchUnloadEvent()
 {
     if (!frame())
@@ -1845,6 +1838,17 @@ void WebLocalFrameImpl::sendPings(const WebURL& destinationURL)
         toHTMLAnchorElement(anchor)->sendPings(destinationURL);
 }
 
+bool WebLocalFrameImpl::dispatchBeforeUnloadEvent(bool* proceed)
+{
+    if (!frame()) {

[dcheng, 2016/05/03 06:51:58]

Do you mind pointing me at the layout test that triggers this condition?

[clamy, 2016/05/03 13:17:09]

It's third_party/WebKit/LayoutTests/fast/events/before-unload-crash.html.

+        *proceed = true;
+        return true;
+    }
+
+    *proceed = frame()->loader().shouldClose();
+    return !!frame();
+}
+
 WebURLRequest WebLocalFrameImpl::requestFromHistoryItem(const WebHistoryItem& item, WebCachePolicy cachePolicy) const
 {
     HistoryItem* historyItem = item;