Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: Source/core/platform/chromium/support/WebMediaStreamTrack.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "core/platform/mediastream/MediaStreamComponent.h" 29 #include "core/platform/mediastream/MediaStreamComponent.h"
30 #include "core/platform/mediastream/MediaStreamSource.h" 30 #include "core/platform/mediastream/MediaStreamSource.h"
31 #include "public/platform/WebAudioSourceProvider.h" 31 #include "public/platform/WebAudioSourceProvider.h"
32 #include "public/platform/WebMediaStream.h" 32 #include "public/platform/WebMediaStream.h"
33 #include "public/platform/WebMediaStreamSource.h" 33 #include "public/platform/WebMediaStreamSource.h"
34 #include "public/platform/WebString.h" 34 #include "public/platform/WebString.h"
35 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
36 36
37 using namespace WebCore; 37 using namespace WebCore;
38 38
39 namespace WebKit { 39 namespace blink {
40 40
41 namespace { 41 namespace {
42 42
43 class ExtraDataContainer : public MediaStreamComponent::ExtraData { 43 class ExtraDataContainer : public MediaStreamComponent::ExtraData {
44 public: 44 public:
45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { } 45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { }
46 46
47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } 47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); }
48 48
49 private: 49 private:
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ASSERT(!m_private.isNull()); 136 ASSERT(!m_private.isNull());
137 m_private->setSourceProvider(provider); 137 m_private->setSourceProvider(provider);
138 #endif // ENABLE(WEB_AUDIO) 138 #endif // ENABLE(WEB_AUDIO)
139 } 139 }
140 140
141 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 141 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
142 { 142 {
143 m_private = other.m_private; 143 m_private = other.m_private;
144 } 144 }
145 145
146 } // namespace WebKit 146 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698