Refactoring: Get rid of isDocument() check in EventTarget.

Source/core/dom/EventTarget.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 50 matching lines @@
 Node* EventTarget::toNode()
 {
     return 0;
 }
 
 DOMWindow* EventTarget::toDOMWindow()
 {
     return 0;
 }
 
+inline DOMWindow* EventTarget::browsingContext()
+{
+    if (ScriptExecutionContext* context = scriptExecutionContext())
+        return context->browsingContext();
+    return 0;
+}
+
 bool EventTarget::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
 {
     EventTargetData* d = ensureEventTargetData();
     return d->eventListenerMap.add(eventType, listener, useCapture);
 }
 
 bool EventTarget::removeEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
 {
     EventTargetData* d = eventTargetData();
     if (!d)
@@ skipping 115 matching lines @@
     if (listenerUnprefixedVector)
         fireEventListeners(event, d, *listenerUnprefixedVector);
     else if (listenerPrefixedVector) {
         AtomicString unprefixedTypeName = event->type();
         event->setType(prefixedTypeName);
         fireEventListeners(event, d, *listenerPrefixedVector);
         event->setType(unprefixedTypeName);
     }
 
     if (!prefixedTypeName.isEmpty()) {
-        ScriptExecutionContext* context = scriptExecutionContext();
-        if (context && context->isDocument()) {
-            Document* document = toDocument(context);
-            if (document->domWindow()) {
-                if (listenerPrefixedVector)
-                    if (listenerUnprefixedVector)
-                        UseCounter::count(document->domWindow(), UseCounter::PrefixedAndUnprefixedTransitionEndEvent);
-                    else
-                        UseCounter::count(document->domWindow(), UseCounter::PrefixedTransitionEndEvent);
-                else if (listenerUnprefixedVector)
-                    UseCounter::count(document->domWindow(), UseCounter::UnprefixedTransitionEndEvent);
+        if (DOMWindow* browsingContext = this->browsingContext()) {
+            if (listenerPrefixedVector) {
+                if (listenerUnprefixedVector)
+                    UseCounter::count(browsingContext, UseCounter::PrefixedAndUnprefixedTransitionEndEvent);
+                else
+                    UseCounter::count(browsingContext, UseCounter::PrefixedTransitionEndEvent);
+            } else if (listenerUnprefixedVector) {
+                UseCounter::count(browsingContext, UseCounter::UnprefixedTransitionEndEvent);
             }
         }
     }
 
     return !event->defaultPrevented();
 }
 
 void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventListenerVector& entry)
 {
     RefPtr<EventTarget> protect = this;
 
     // Fire all listeners registered for this event. Don't fire listeners removed
     // during event dispatch. Also, don't fire event listeners added during event
     // dispatch. Conveniently, all new event listeners will be added after or at
     // index |size|, so iterating up to (but not including) |size| naturally excludes
     // new event listeners.
 
-    ScriptExecutionContext* context = scriptExecutionContext();
-    if (context && context->isDocument() && event->type() == eventNames().beforeunloadEvent) {
-        Document* document = toDocument(context);
-        if (DOMWindow* domWindow = document->domWindow()) {
-            if (domWindow != domWindow->top())
-                UseCounter::count(domWindow, UseCounter::SubFrameBeforeUnloadFired);
+    if (event->type() == eventNames().beforeunloadEvent) {
+        if (DOMWindow* browsingContext = this->browsingContext()) {
+            if (browsingContext->top())
+                UseCounter::count(browsingContext, UseCounter::SubFrameBeforeUnloadFired);
         }
     }
 
     bool userEventWasHandled = false;
     size_t i = 0;
     size_t size = entry.size();
     if (!d->firingEventIterators)
         d->firingEventIterators = adoptPtr(new FiringEventIteratorVector);
     d->firingEventIterators->append(FiringEventIterator(event->type(), i, size));
     for ( ; i < size; ++i) {
@@ skipping 12 matching lines @@
         InspectorInstrumentationCookie cookie = InspectorInstrumentation::willHandleEvent(context, event);
         // To match Mozilla, the AT_TARGET phase fires both capturing and bubbling
         // event listeners, even though that violates some versions of the DOM spec.
         registeredListener.listener->handleEvent(context, event);
         if (!userEventWasHandled && ScriptController::processingUserGesture())
             userEventWasHandled = true;
         InspectorInstrumentation::didHandleEvent(cookie);
     }
     d->firingEventIterators->removeLast();
     if (userEventWasHandled) {
-        ScriptExecutionContext* context = scriptExecutionContext();
-        if (context && context->isDocument()) {
-            Document* document = toDocument(context);
-            document->resetLastHandledUserGestureTimestamp();
-        }
+        if (ScriptExecutionContext* context = scriptExecutionContext())
+            context->userEventWasHandled();

[abarth-chromium, 2013/08/09 16:25:53]

userEventWasHandled -> didHandleUserEvent ?

     }
 }
 
 const EventListenerVector& EventTarget::getEventListeners(const AtomicString& eventType)
 {
     DEFINE_STATIC_LOCAL(EventListenerVector, emptyVector, ());
 
     EventTargetData* d = eventTargetData();
     if (!d)
         return emptyVector;
@@ skipping 16 matching lines @@
     // they have one less listener to invoke.
     if (d->firingEventIterators) {
         for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
             d->firingEventIterators->at(i).iterator = 0;
             d->firingEventIterators->at(i).end = 0;
         }
     }
 }
 
 } // namespace WebCore