Fix oninstall-script tests for service worker

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 86 matching lines @@
     double timeOrigin,
     std::unique_ptr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData,
     WorkerClients* workerClients)
     : WorkerGlobalScope(url,
                         userAgent,
                         thread,
                         timeOrigin,
                         std::move(starterOriginPrivilegeData),
                         workerClients),
       m_didEvaluateScript(false),
-      m_hadErrorInTopLevelEventHandler(false),
-      m_eventNestingLevel(0),
       m_scriptCount(0),
       m_scriptTotalSize(0),
       m_scriptCachedMetadataTotalSize(0) {}
 
 ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() {}
 
 void ServiceWorkerGlobalScope::countScript(size_t scriptSize,
                                            size_t cachedMetadataSize) {
   ++m_scriptCount;
   m_scriptTotalSize += scriptSize;
@@ skipping 76 matching lines @@
   return WorkerGlobalScope::addEventListenerInternal(eventType, listener,
                                                      options);
 }
 
 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const {
   return EventTargetNames::ServiceWorkerGlobalScope;
 }
 
 DispatchEventResult ServiceWorkerGlobalScope::dispatchEventInternal(
     Event* event) {
-  m_eventNestingLevel++;
-  DispatchEventResult dispatchResult =
-      WorkerGlobalScope::dispatchEventInternal(event);
-  if (event->interfaceName() == EventNames::ErrorEvent &&
-      m_eventNestingLevel == 2)
-    m_hadErrorInTopLevelEventHandler = true;
-  m_eventNestingLevel--;
-  return dispatchResult;
+  return WorkerGlobalScope::dispatchEventInternal(event);

[falken, 2017/03/21 04:27:37]

Since it's now just calling the superclass's function, we can just remove this
function.

[yiyix, 2017/03/21 05:44:27]

Good call. Removed. 

 }
 
 void ServiceWorkerGlobalScope::dispatchExtendableEvent(
     Event* event,
     WaitUntilObserver* observer) {
-  ASSERT(m_eventNestingLevel == 0);
-  m_hadErrorInTopLevelEventHandler = false;
-
   observer->willDispatchEvent();
   dispatchEvent(event);
 
   // Check if the worker thread is forcibly terminated during the event
   // because of timeout etc.
-  if (thread()->isForciblyTerminated())
-    m_hadErrorInTopLevelEventHandler = true;
-
-  observer->didDispatchEvent(m_hadErrorInTopLevelEventHandler);
+  observer->didDispatchEvent(thread()->isForciblyTerminated());

[falken, 2017/03/21 04:27:37]

Note for future reference: we could probably revisit whether we need this check
as well, but it doesn't need to be in this patch.

[yiyix, 2017/03/21 05:44:27]

Would it be preferable to add a TODO?

[falken, 2017/03/21 05:52:15]

Hm, I think it's OK without it. The code will probably be like this for a while.

 }
 
 DEFINE_TRACE(ServiceWorkerGlobalScope) {
   visitor->trace(m_clients);
   visitor->trace(m_registration);
   WorkerGlobalScope::trace(visitor);
 }
 
 void ServiceWorkerGlobalScope::importScripts(const Vector<String>& urls,
                                              ExceptionState& exceptionState) {
@@ skipping 14 matching lines @@
 }
 
 void ServiceWorkerGlobalScope::exceptionThrown(ErrorEvent* event) {
   WorkerGlobalScope::exceptionThrown(event);
   if (WorkerThreadDebugger* debugger =
           WorkerThreadDebugger::from(thread()->isolate()))
     debugger->exceptionThrown(thread(), event);
 }
 
 }  // namespace blink