Web MIDI: final IDL updates to conform the latest WD for shipping

Source/modules/webmidi/MIDIPort.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 
 using PortState = MIDIAccessor::MIDIPortState;
 
 MIDIPort::MIDIPort(MIDIAccess* access, const String& id, const String& manufacturer, const String& name, MIDIPortTypeCode type, const String& version, PortState state)
     : m_id(id)
     , m_manufacturer(manufacturer)
     , m_name(name)
     , m_type(type)
     , m_version(version)
     , m_access(access)
+    , m_connection(MIDIPortConnectionStateClosed)
 {
     ASSERT(access);
     ASSERT(type == MIDIPortTypeInput || type == MIDIPortTypeOutput);
     ASSERT(state == PortState::MIDIPortStateDisconnected
         || state == PortState::MIDIPortStateConnected
         || state == PortState::MIDIPortStateOpened);
     // FIXME: Remove following code once blink API has a real open and close
     // operations.
     if (state == PortState::MIDIPortStateOpened)
         state = PortState::MIDIPortStateConnected;
     m_state = state;
 }
 
+String MIDIPort::connection() const
+{
+    switch (m_connection) {
+    case MIDIPortConnectionStateOpen:
+        return "open";
+    case MIDIPortConnectionStateClosed:
+        return "closed";
+    case MIDIPortConnectionStatePending:
+        return "pending";
+    default:

[tkent, 2015/03/30 23:16:30]

Please do not add "default:"  It prevents compile-time check for enum coverage.

[Takashi Toyoshima, 2015/03/31 01:19:48]

Done.

+        ASSERT_NOT_REACHED();
+    }
+    return emptyString();
+}
+
 String MIDIPort::state() const
 {
     switch (m_state) {
     case PortState::MIDIPortStateDisconnected:
         return "disconnected";
     case PortState::MIDIPortStateConnected:
         return "connected";
-    case PortState::MIDIPortStateOpened:
-        return "opened";
     default:
         ASSERT_NOT_REACHED();
     }
     return emptyString();
 }
 
 String MIDIPort::type() const
 {
     switch (m_type) {
     case MIDIPortTypeInput:
         return "input";
     case MIDIPortTypeOutput:
         return "output";
     default:
         ASSERT_NOT_REACHED();
     }
     return emptyString();
 }
 
 ScriptPromise MIDIPort::open(ScriptState* scriptState)
 {
+    // FIXME: Implement the latest open() algorithm.

[tkent, 2015/03/30 23:16:30]

nit: FIXME -> TODO(toyoshim)

[Takashi Toyoshima, 2015/03/31 01:19:48]

Done.

     switch (m_state) {
     case PortState::MIDIPortStateDisconnected:
         return reject(scriptState, InvalidStateError, "The port has been disconnected.");
     case PortState::MIDIPortStateConnected:
         // FIXME: Add blink API to perform a real open operation.
-        setState(PortState::MIDIPortStateOpened);
-        // fall through
-    case PortState::MIDIPortStateOpened:
+        setStates(m_state, MIDIPortConnectionStateOpen);
         return accept(scriptState);
     default:
         ASSERT_NOT_REACHED();
     }
     return reject(scriptState, InvalidStateError, "The port is in unknown state.");
 }
 
 ScriptPromise MIDIPort::close(ScriptState* scriptState)
 {
+    // FIXME: Implement the latest close() algorithm.

[tkent, 2015/03/30 23:16:30]

Ditto.

[Takashi Toyoshima, 2015/03/31 01:19:48]

Done.

     switch (m_state) {
     case PortState::MIDIPortStateDisconnected:
         return reject(scriptState, InvalidStateError, "The port has been disconnected.");
-    case PortState::MIDIPortStateOpened:
+    case PortState::MIDIPortStateConnected:
         // FIXME: Add blink API to perform a real close operation.
-        setState(PortState::MIDIPortStateConnected);
-        // fall through
-    case PortState::MIDIPortStateConnected:
+        setStates(m_state, MIDIPortConnectionStateClosed);
         return accept(scriptState);
     default:
         ASSERT_NOT_REACHED();
     }
     return reject(scriptState, InvalidStateError, "The port is in unknown state.");
 }
 
 void MIDIPort::setState(PortState state)
 {
-    if (m_state == state)
-        return;
-    m_state = state;
-    dispatchEvent(MIDIConnectionEvent::create(this));
+    setStates(state, m_connection);
 }
 
 ExecutionContext* MIDIPort::executionContext() const
 {
     return m_access->executionContext();
 }
 
 DEFINE_TRACE(MIDIPort)
 {
     visitor->trace(m_access);
     RefCountedGarbageCollectedEventTargetWithInlineData<MIDIPort>::trace(visitor);
 }
 
 ScriptPromise MIDIPort::accept(ScriptState* scriptState)
 {
     return ScriptPromise::cast(scriptState, toV8(this, scriptState->context()->Global(), scriptState->isolate()));
 }
 
 ScriptPromise MIDIPort::reject(ScriptState* scriptState, ExceptionCode ec, const String& message)
 {
     return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(ec, message));
 }
 
+void MIDIPort::setStates(PortState state, MIDIPortConnectionState connection)
+{
+    if (m_state == state && m_connection == connection)
+        return;
+    m_state = state;
+    m_connection = connection;
+    dispatchEvent(MIDIConnectionEvent::create(this));

[tkent, 2015/03/30 23:16:30]

Is it possible to delete |this| by JavaScript code kicked by the event?

[Takashi Toyoshima, 2015/03/31 01:19:48]

Ah, I see. JavaScript can release the last reference in the handler.
Before Oilpan, we retain a reference to be finish function safely, but what's
the standard way in Oilpan? Just having a local reference of "this" in callers
will fix the problem? Please review the new code that is expected to fix the
issue.

+}
+
 } // namespace blink