Merge 142887

Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

 /*
  * Copyright (C) 2012 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:
  * 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 225 matching lines @@
 }
 
 ScriptExecutionContext* RTCDataChannel::scriptExecutionContext() const
 {
     return m_scriptExecutionContext;
 }
 
 void RTCDataChannel::stop()
 {
     m_stopped = true;
+    m_readyState = ReadyStateClosed;
     m_handler->setClient(0);
     m_scriptExecutionContext = 0;
 }
 
 EventTargetData* RTCDataChannel::eventTargetData()
 {
     return &m_eventTargetData;
 }
 
 EventTargetData* RTCDataChannel::ensureEventTargetData()
@@ skipping 20 matching lines @@
     Vector<RefPtr<Event> >::iterator it = events.begin();
     for (; it != events.end(); ++it)
         dispatchEvent((*it).release());
 
     events.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)