Make ifdefs consistent in WebKit/Source/core/

third_party/WebKit/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 358 matching lines @@
 }
 
 void LocalDOMWindow::enqueueDocumentEvent(Event* event) {
   if (!m_eventQueue)
     return;
   event->setTarget(m_document.get());
   m_eventQueue->enqueueEvent(event);
 }
 
 void LocalDOMWindow::dispatchWindowLoadEvent() {
+#if DCHECK_IS_ON()
   ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());

[mstensho (USE GERRIT), 2016/11/18 08:45:54]

Just use DCHECK() instead?

[Alexander Alekseev, 2016/11/18 22:32:14]

Done.

+#endif
   // Delay 'load' event if we are in EventQueueScope.  This is a short-term
   // workaround to avoid Editing code crashes.  We should always dispatch
   // 'load' event asynchronously.  crbug.com/569511.
   if (ScopedEventQueue::instance()->shouldQueueEvents() && m_document) {
     m_document->postTask(
         BLINK_FROM_HERE,
         createSameThreadTask(&LocalDOMWindow::dispatchLoadEvent,
                              wrapPersistent(this)));
     return;
   }
@@ skipping 1022 matching lines @@
     owner->dispatchLoad();
 
   TRACE_EVENT_INSTANT1("devtools.timeline", "MarkLoad",
                        TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorMarkLoadEvent::data(frame()));
   InspectorInstrumentation::loadEventFired(frame());
 }
 
 DispatchEventResult LocalDOMWindow::dispatchEvent(Event* event,
                                                   EventTarget* target) {
+#if DCHECK_IS_ON()
   ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
+#endif
 
   event->setTrusted(true);
   event->setTarget(target ? target : this);
   event->setCurrentTarget(this);
   event->setEventPhase(Event::kAtTarget);
 
   TRACE_EVENT1("devtools.timeline", "EventDispatch", "data",
                InspectorEventDispatchEvent::data(*event));
   return fireEventListeners(event);
 }
@@ skipping 121 matching lines @@
 
 LocalFrame* LocalDOMWindow::frame() const {
   // If the LocalDOMWindow still has a frame reference, that frame must point
   // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
   // where script execution leaks between different LocalDOMWindows.
   SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this);
   return m_frame;
 }
 
 }  // namespace blink