Merge 111775

Source/WebCore/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 696 matching lines @@
                 m_textTracksWhenResourceSelectionBegan.append(track);
         }
     }
 #endif
 
     configureMediaControls();
 }
 
 void HTMLMediaElement::loadInternal()
 {
+    // Some of the code paths below this function dispatch the BeforeLoad event. This ASSERT helps
+    // us catch those bugs more quickly without needing all the branches to align to actually
+    // trigger the event.
+    ASSERT(!eventDispatchForbidden());
+
     // If we can't start a load right away, start it later.
     Page* page = document()->page();
     if (pageConsentRequiredForLoad() && page && !page->canStartMedia()) {
         if (m_isWaitingUntilMediaCanStart)
             return;
         document()->addMediaCanStartListener(this);
         m_isWaitingUntilMediaCanStart = true;
         return;
     }
     
@@ skipping 3034 matching lines @@
 
 bool HTMLMediaElement::shouldDisableSleep() const
 {
     return m_player && !m_player->paused() && hasVideo() && hasAudio() && !loop();
 }
 #endif
 
 }
 
 #endif