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

[acolwell GONE FROM CHROMIUM, 2013/04/19 17:45:49]

Something doesn't look right here. You should not need this #define, the
ExportMacros.h below.

[Matthew Heaney (Chromium), 2013/04/20 04:19:25]

I left the <wft/ExportMacros.h> in.  Wouldn't compile without it.  Perhaps
there's some alternative.

+#include <wtf/ExportMacros.h>
+#include "InbandTextTrackPrivateImpl.h"
+#include "WebInbandTextTrack.h"
+#include "WebInbandTextTrackClientImpl.h"
+#include <wtf/PassOwnPtr.h>
+#define WEBKIT_IMPLEMENTATION 1
+#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"

[acolwell GONE FROM CHROMIUM, 2013/04/19 17:45:49]

This should just be #include <public/WebString.h> and above <wtf/PassOwnPtr.h>

[Matthew Heaney (Chromium), 2013/04/20 04:19:25]

Done.

[Matthew Heaney (Chromium), 2013/04/20 04:19:25]

Done.

+
+namespace WebKit {
+
+InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(WebInbandTextTrack* track)
+    : m_track(WTF::adoptPtr(track))
+{
+    ASSERT(track);
+}
+
+InbandTextTrackPrivateImpl::~InbandTextTrackPrivateImpl()
+{
+}
+
+void InbandTextTrackPrivateImpl::setClient(WebCore::InbandTextTrackPrivateClient* client)

[acolwell GONE FROM CHROMIUM, 2013/04/19 17:45:49]

I think things could be simplified if you just use the storage in the base class
for 'client' and have this object implement WebInbandTextTrackClient instead of
creating a separate WebInbandTextTrackClientImpl object.

This function would then become the following
{
  InbandTextTrackPrivate::setClient(client);
  m_track->setClient(this);
}

and you'd only have to add the following to this class.
void addWebVTTCue(
     double start,
     double end,
     const WebString& id,
     const WebString& content,
     const WebString& settings)
 {
     client()->addWebVTTCue(this, start, end, id, content, settings);
 }

[Matthew Heaney (Chromium), 2013/04/20 04:19:25]

Done.

+{
+    if (client == NULL)
+      m_track->setClient(NULL);
+    else
+      m_track->setClient(new WebInbandTextTrackClientImpl(client));
+}
+
+WebCore::InbandTextTrackPrivateClient* InbandTextTrackPrivateImpl::client()
+{
+    if (WebInbandTextTrackClient* client = m_track->client())

[acolwell GONE FROM CHROMIUM, 2013/04/19 17:45:49]

If you use the base class storage like I mention above, you don't even need to
implement this method.

[Matthew Heaney (Chromium), 2013/04/20 04:19:25]

Done.

+      return client->client();
+    else
+      return NULL;
+}
+
+void InbandTextTrackPrivateImpl::setMode(Mode mode)
+{
+    m_track->setMode(static_cast<WebInbandTextTrack::Mode>(mode));
+}
+
+WebCore::InbandTextTrackPrivate::Mode InbandTextTrackPrivateImpl::mode() const
+{
+    return static_cast<WebCore::InbandTextTrackPrivate::Mode>(m_track->mode());
+}
+
+WebCore::InbandTextTrackPrivate::Kind InbandTextTrackPrivateImpl::kind() const
+{
+    return static_cast<WebCore::InbandTextTrackPrivate::Kind>(m_track->kind());
+}
+
+bool InbandTextTrackPrivateImpl::isClosedCaptions()
+{
+    return m_track->isClosedCaptions();
+}
+
+AtomicString InbandTextTrackPrivateImpl::label() const
+{
+    return m_track->label();
+}
+
+AtomicString InbandTextTrackPrivateImpl::language() const
+{
+    return m_track->language();
+}
+
+bool InbandTextTrackPrivateImpl::isDefault() const
+{
+    return m_track->isDefault();
+}
+
+int InbandTextTrackPrivateImpl::textTrackIndex() const
+{
+    return m_track->textTrackIndex();
+}
+
+} // namespace WebKit