third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp - Issue 1479923002: Enumerate the return value of dispatchEvent so it is clear.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp

Issue 1479923002: Enumerate the return value of dispatchEvent so it is clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_passive_uma_add

Patch Set: Add back the EventDispatchResult enum Created 4 years, 10 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

« third_party/WebKit/Source/core/input/EventHandler.cpp ('K') | « third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h ('k') | third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp

index 8fdb935c43cc41dc37c59eedf778f1aa1546ec21..8ab12c488f0d034a8390fb9620f0a78c37195002 100644

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

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

@@ -167,11 +167,11 @@ const AtomicString& ServiceWorkerGlobalScope::interfaceName() const

return EventTargetNames::ServiceWorkerGlobalScope;

}

-bool ServiceWorkerGlobalScope::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)

+EventTarget::DispatchEventResult ServiceWorkerGlobalScope::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)

{

m_eventNestingLevel++;

- bool result = WorkerGlobalScope::dispatchEventInternal(event.get());

- if (event->interfaceName() == EventNames::ErrorEvent && m_eventNestingLevel == 2)

+ EventTarget::DispatchEventResult result = WorkerGlobalScope::dispatchEventInternal(event.get());

+ if (event->interfaceName() == EventNames::ErrorEvent && m_eventNestingLevel == 2 && !event->defaultPrevented())

m_hadErrorInTopLevelEventHandler = true;

m_eventNestingLevel--;

return result;