Have WebFrameClient::suddenTerminationDisablerChanged return a boolean

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 211 matching lines @@
 
 static DOMWindowSet& windowsWithBeforeUnloadEventListeners()
 {
     DEFINE_STATIC_LOCAL(DOMWindowSet, windowsWithBeforeUnloadEventListeners, ());
     return windowsWithBeforeUnloadEventListeners;
 }
 
 static void addUnloadEventListener(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithUnloadEventListeners();
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         disableSuddenTermination();
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                true, FrameLoaderClient::UnloadHandler);
+        }
+    }
     set.add(domWindow);
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            1, FrameLoaderClient::UnloadHandler);
-    }
 }
 
 static void removeUnloadEventListener(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithUnloadEventListeners();
     DOMWindowSet::iterator it = set.find(domWindow);
     if (it == set.end())
         return;
     set.remove(it);
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         enableSuddenTermination();
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            -1, FrameLoaderClient::UnloadHandler);
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                false, FrameLoaderClient::UnloadHandler);
+        }
     }
 }
 
 static void removeAllUnloadEventListeners(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithUnloadEventListeners();
     DOMWindowSet::iterator it = set.find(domWindow);
     if (it == set.end())
         return;
-    int numHandlers = set.count(domWindow);
     set.removeAll(it);
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         enableSuddenTermination();
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            -numHandlers, FrameLoaderClient::UnloadHandler);
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                false, FrameLoaderClient::UnloadHandler);
+        }
     }
 }
 
 static void addBeforeUnloadEventListener(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         disableSuddenTermination();
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                true, FrameLoaderClient::BeforeUnloadHandler);
+        }
+    }
     set.add(domWindow);
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            1, FrameLoaderClient::BeforeUnloadHandler);
-    }
 }
 
 static void removeBeforeUnloadEventListener(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
     DOMWindowSet::iterator it = set.find(domWindow);
     if (it == set.end())
         return;
     set.remove(it);
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         enableSuddenTermination();
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            -1, FrameLoaderClient::BeforeUnloadHandler);
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                false, FrameLoaderClient::BeforeUnloadHandler);
+        }
     }
 }
 
 static void removeAllBeforeUnloadEventListeners(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
     DOMWindowSet::iterator it = set.find(domWindow);
     if (it == set.end())
         return;
-    int numHandlers = set.count(domWindow);
     set.removeAll(it);
-    if (set.isEmpty())
+    if (set.isEmpty()) {
         enableSuddenTermination();
-    if (domWindow->frame()) {
-        domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
-            -numHandlers, FrameLoaderClient::BeforeUnloadHandler);
+        if (domWindow->frame()) {
+            domWindow->frame()->loader().client()->suddenTerminationDisablerChanged(
+                false, FrameLoaderClient::BeforeUnloadHandler);
+        }
     }
 }
 
 static bool allowsBeforeUnloadListeners(LocalDOMWindow* window)
 {
     ASSERT_ARG(window, window);
     LocalFrame* frame = window->frame();
     if (!frame)
         return false;
     return frame->isMainFrame();
@@ skipping 1509 matching lines @@
     return m_frameObserver->frame();
 }
 
 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
     return v8::Handle<v8::Object>();
 }
 
 } // namespace blink