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

Side by Side Diff: Source/web/InbandTextTrackPrivateImpl.cpp

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Adapt patch to already moved ContentDecryption files 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
« no previous file with comments | « Source/web/InbandTextTrackPrivateImpl.h ('k') | Source/web/WebKit.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "InbandTextTrackPrivateImpl.h" 32 #include "InbandTextTrackPrivateImpl.h"
33 33
34 #include "WebInbandTextTrack.h" 34 #include "WebInbandTextTrack.h"
35 #include "core/platform/graphics/InbandTextTrackPrivateClient.h" 35 #include "platform/graphics/media/InbandTextTrackPrivateClient.h"
36 #include "public/platform/WebString.h" 36 #include "public/platform/WebString.h"
37 37
38 namespace WebKit { 38 namespace WebKit {
39 39
40 InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(WebInbandTextTrack* track ) 40 InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(WebInbandTextTrack* track )
41 : m_track(track) 41 : m_track(track)
42 { 42 {
43 ASSERT(track); 43 ASSERT(track);
44 track->setClient(this); 44 track->setClient(this);
45 } 45 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 double start, 93 double start,
94 double end, 94 double end,
95 const WebString& id, 95 const WebString& id,
96 const WebString& content, 96 const WebString& content,
97 const WebString& settings) 97 const WebString& settings)
98 { 98 {
99 client()->addWebVTTCue(this, start, end, id, content, settings); 99 client()->addWebVTTCue(this, start, end, id, content, settings);
100 } 100 }
101 101
102 } // namespace WebKit 102 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/InbandTextTrackPrivateImpl.h ('k') | Source/web/WebKit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698