Create WebInbandTextTrack and WebInbandTextTrackClient

Source/WebKit/chromium/src/InbandTextTrackPrivateImpl.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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define WEBKIT_IMPLEMENTATION 1
+#include <wtf/ExportMacros.h>
+#include "InbandTextTrackPrivateImpl.h"
+#include "WebInbandTextTrack.h"
+#define WEBKIT_IMPLEMENTATION 1
+#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
+
+namespace WebKit {
+
+InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(
+    WebInbandTextTrack* track)

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

nit: Blink style doesn't require 80-col wrap for something like this. It prefers
a single line for something like this.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+    : m_track(track)
+{

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

nit: Add ASSERT(!m_track); here and remove all m_track NULL checks below since
m_track never gets updated after construction.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+}
+
+InbandTextTrackPrivateImpl::~InbandTextTrackPrivateImpl()
+{
+}
+
+void InbandTextTrackPrivateImpl::setClient(
+    WebCore::InbandTextTrackPrivateClient* client)
+{
+    if (!m_track)
+        return;
+
+    // TODO(matthewjheaney): not sure what to do here yet

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

At a minimum you need to store the pointer so client() returns what was passed
to setClient().

You should pass a WebInbandTextTrackClientImpl() that wraps client here if
client is non-NULL and pass 0 otherwise.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+    //m_track->setClient(client);
+    // For now:
+    m_track->setClient(NULL);
+}
+
+WebCore::InbandTextTrackPrivateClient* InbandTextTrackPrivateImpl::client()
+{
+    if (!m_track)
+        return NULL;  // TODO(matthewjheaney): is this really correct?
+
+    // TODO(matthewjheaney): not sure how to handle this yet
+    //return m_track->client();
+    // For now:
+    return NULL;

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

Update to return m_client.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+}
+
+void InbandTextTrackPrivateImpl::setMode(Mode mode)
+{
+    if (!m_track)
+        return;
+
+    const WebInbandTextTrack::Mode mode_map[] =
+    {
+        WebInbandTextTrack::Disabled,
+        WebInbandTextTrack::Hidden,
+        WebInbandTextTrack::Showing
+    };
+
+    const WebInbandTextTrack::Mode m = mode_map[mode];

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

nit: Use a static_cast and there is no need for a local variable.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+
+    m_track->setMode(m);
+}
+
+WebCore::InbandTextTrackPrivate::Mode InbandTextTrackPrivateImpl::mode() const
+{
+    typedef WebCore::InbandTextTrackPrivate T;
+
+    if (!m_track)
+      // TODO(matthewjheaney): correct?
+      return T::Disabled;
+
+    const T::Mode mode_map[] =
+    {
+        T::Disabled,
+        T::Hidden,
+        T::Showing
+    };
+
+    const T::Mode result = mode_map[m_track->mode()];

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

ditto

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+    return result;
+}
+
+WebCore::InbandTextTrackPrivate::Kind InbandTextTrackPrivateImpl::kind() const
+{
+    typedef WebCore::InbandTextTrackPrivate T;
+
+    if (!m_track)
+      // TODO(matthewjheaney): correct?
+      return T::None;
+
+    const T::Kind kind_map[] =
+    {
+        T::Subtitles,
+        T::Captions,
+        T::Descriptions,
+        T::Chapters,
+        T::Metadata,
+        T::None
+    };
+
+    const T::Kind result = kind_map[m_track->kind()];

[acolwell GONE FROM CHROMIUM, 2013/04/17 00:13:56]

ditto

[Matthew Heaney (Chromium), 2013/04/18 23:15:42]

Done.

+    return result;
+}
+
+bool InbandTextTrackPrivateImpl::isClosedCaptions()
+{
+    if (!m_track)
+        return false;  // TODO(matthewjheaney): correct value?
+
+    return m_track->isClosedCaptions();
+}
+
+AtomicString InbandTextTrackPrivateImpl::label() const
+{
+    if (!m_track)
+        return AtomicString();  // TODO(matthewjheaney): correct?
+
+    return m_track->label();
+}
+
+AtomicString InbandTextTrackPrivateImpl::language() const
+{
+    if (!m_track)
+        return AtomicString();  // TODO(matthewjheaney): "eng" perhaps?
+
+    return m_track->language();
+}
+
+bool InbandTextTrackPrivateImpl::isDefault() const
+{
+    if (!m_track)
+        return false;  // TODO(matthewjheaney): correct?
+
+    return m_track->isDefault();
+}
+
+int InbandTextTrackPrivateImpl::textTrackIndex() const
+{
+    if (!m_track)
+        return 0;  // TODO(matthewjheaney): correct?
+
+    return m_track->textTrackIndex();
+}
+
+} // namespace WebKit