diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/platform/mock/mediasource/MockTracks.h | |
parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
download | WebKitGtk-tarball-master.tar.gz |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/platform/mock/mediasource/MockTracks.h')
-rw-r--r-- | Source/WebCore/platform/mock/mediasource/MockTracks.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Source/WebCore/platform/mock/mediasource/MockTracks.h b/Source/WebCore/platform/mock/mediasource/MockTracks.h index 3f8eded74..073f36863 100644 --- a/Source/WebCore/platform/mock/mediasource/MockTracks.h +++ b/Source/WebCore/platform/mock/mediasource/MockTracks.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013-2017 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. 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 @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MockTracks_h -#define MockTracks_h +#pragma once #if ENABLE(MEDIA_SOURCE) @@ -37,7 +36,7 @@ namespace WebCore { class MockAudioTrackPrivate : public AudioTrackPrivate { public: - static RefPtr<MockAudioTrackPrivate> create(const MockTrackBox& box) { return adoptRef(new MockAudioTrackPrivate(box)); } + static Ref<MockAudioTrackPrivate> create(const MockTrackBox& box) { return adoptRef(*new MockAudioTrackPrivate(box)); } virtual ~MockAudioTrackPrivate() { } virtual AtomicString id() const { return m_id; } @@ -45,7 +44,7 @@ public: protected: MockAudioTrackPrivate(const MockTrackBox& box) : m_box(box) - , m_id(String::format("%d", box.trackID())) + , m_id(AtomicString::number(box.trackID())) { } MockTrackBox m_box; @@ -63,7 +62,7 @@ protected: MockTextTrackPrivate(const MockTrackBox& box) : InbandTextTrackPrivate(InbandTextTrackPrivate::Generic) , m_box(box) - , m_id(String::format("%d", box.trackID())) + , m_id(AtomicString::number(box.trackID())) { } MockTrackBox m_box; @@ -81,7 +80,7 @@ public: protected: MockVideoTrackPrivate(const MockTrackBox& box) : m_box(box) - , m_id(String::format("%d", box.trackID())) + , m_id(AtomicString::number(box.trackID())) { } MockTrackBox m_box; @@ -91,5 +90,3 @@ protected: } #endif - -#endif |