Make sure peer connection states are updated properly

third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

 /*
  * 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
@@ skipping 26 matching lines @@
 #include "modules/EventTargetModules.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/RTCIceCandidate.h"
 #include "platform/AsyncMethodRunner.h"
 #include "public/platform/WebMediaConstraints.h"
 #include "public/platform/WebRTCPeerConnectionHandler.h"
 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
 
 namespace blink {
-
 class ExceptionState;
 class MediaStreamTrack;
 class RTCConfiguration;
 class RTCDTMFSender;
 class RTCDataChannel;
 class RTCErrorCallback;
 class RTCOfferOptions;
 class RTCSessionDescription;
 class RTCSessionDescriptionCallback;
 class RTCStatsCallback;
@@ skipping 91 matching lines @@
     bool hasPendingActivity() const override
     {
         return !m_closed && !m_stopped;
     }
 
     // Oilpan: need to eagerly finalize m_peerHandler
     EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
+    typedef Function<bool()> BoolFunction;
+    class EventWrapper {
+    public:
+        EventWrapper(PassRefPtrWillBeRawPtr<Event>, PassOwnPtrWillBeRawPtr<BoolFunction>);
+        // Returns true if |m_setupFunction| returns true or it is null.
+        // |m_event| will only be fired if setup() returns true;
+        bool setup();
+
+        RefPtrWillBeMember<Event> m_event;
+
+    private:
+        PassOwnPtrWillBeRawPtr<BoolFunction> m_setupFunction;

[haraken, 2015/12/17 03:03:20]

This is wrong even on non-oilpan... This must be an OwnPtr.

+    };
+
     RTCPeerConnection(ExecutionContext*, RTCConfiguration*, WebMediaConstraints, ExceptionState&);
 
     static RTCConfiguration* parseConfiguration(const Dictionary&, ExceptionState&);
     static RTCOfferOptions* parseOfferOptions(const Dictionary&, ExceptionState&);
 
     void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
+    void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>, PassOwnPtrWillBeRawPtr<BoolFunction>);
     void dispatchScheduledEvent();
     bool hasLocalStreamWithTrackId(const String& trackId);
 
     void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState);
     void changeIceGatheringState(WebRTCPeerConnectionHandlerClient::ICEGatheringState);
+    // Changes the state immediately; does not fire an event.
+    // Returns true if the state was changed.
+    bool setIceConnectionState(WebRTCPeerConnectionHandlerClient::ICEConnectionState);
+    // Changes the state asynchronously and fires an event immediately after changing the state.
     void changeIceConnectionState(WebRTCPeerConnectionHandlerClient::ICEConnectionState);
 
     void closeInternal();
 
     SignalingState m_signalingState;
     ICEGatheringState m_iceGatheringState;
     ICEConnectionState m_iceConnectionState;
 
     MediaStreamVector m_localStreams;
     MediaStreamVector m_remoteStreams;
 
     HeapVector<Member<RTCDataChannel>> m_dataChannels;
 
     OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler;
 
     AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
-    WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
+    WillBeHeapVector<EventWrapper> m_scheduledEvents;
 
     bool m_stopped;
     bool m_closed;
 };
 
 } // namespace blink
 
 #endif // RTCPeerConnection_h