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

Side by Side Diff: Source/core/platform/graphics/MediaPlayer.h

Issue 14936003: Remove unused code behind USE(PLATFORM_TEXT_TRACK_MENU) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 7 months 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
« no previous file with comments | « Source/core/html/track/TextTrack.cpp ('k') | Source/core/platform/graphics/MediaPlayer.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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 20 matching lines...) Expand all
31 #include "core/platform/graphics/InbandTextTrackPrivate.h" 31 #include "core/platform/graphics/InbandTextTrackPrivate.h"
32 #include "core/platform/graphics/IntRect.h" 32 #include "core/platform/graphics/IntRect.h"
33 #include "core/platform/graphics/LayoutRect.h" 33 #include "core/platform/graphics/LayoutRect.h"
34 #include "core/platform/graphics/PlatformLayer.h" 34 #include "core/platform/graphics/PlatformLayer.h"
35 #include <wtf/Forward.h> 35 #include <wtf/Forward.h>
36 #include <wtf/Noncopyable.h> 36 #include <wtf/Noncopyable.h>
37 #include <wtf/OwnPtr.h> 37 #include <wtf/OwnPtr.h>
38 #include <wtf/PassOwnPtr.h> 38 #include <wtf/PassOwnPtr.h>
39 #include <wtf/text/StringHash.h> 39 #include <wtf/text/StringHash.h>
40 40
41
42 #if USE(PLATFORM_TEXT_TRACK_MENU)
43 #include "core/platform/graphics/PlatformTextTrackMenu.h"
44 #endif
45
46 namespace WebCore { 41 namespace WebCore {
47 42
48 class AudioSourceProvider; 43 class AudioSourceProvider;
49 class CachedResourceLoader; 44 class CachedResourceLoader;
50 class ContentType; 45 class ContentType;
51 class Document; 46 class Document;
52 class FrameView; 47 class FrameView;
53 class GraphicsContext; 48 class GraphicsContext;
54 class GraphicsContext3D; 49 class GraphicsContext3D;
55 class HostWindow; 50 class HostWindow;
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 String userAgent() const; 345 String userAgent() const;
351 346
352 CachedResourceLoader* cachedResourceLoader(); 347 CachedResourceLoader* cachedResourceLoader();
353 348
354 void addTextTrack(PassRefPtr<InbandTextTrackPrivate>); 349 void addTextTrack(PassRefPtr<InbandTextTrackPrivate>);
355 void removeTextTrack(PassRefPtr<InbandTextTrackPrivate>); 350 void removeTextTrack(PassRefPtr<InbandTextTrackPrivate>);
356 351
357 bool requiresTextTrackRepresentation() const; 352 bool requiresTextTrackRepresentation() const;
358 void setTextTrackRepresentation(TextTrackRepresentation*); 353 void setTextTrackRepresentation(TextTrackRepresentation*);
359 354
360 #if USE(PLATFORM_TEXT_TRACK_MENU)
361 bool implementsTextTrackControls() const;
362 PassRefPtr<PlatformTextTrackMenuInterface> textTrackMenu();
363 #endif
364
365 private: 355 private:
366 MediaPlayer(MediaPlayerClient*); 356 MediaPlayer(MediaPlayerClient*);
367 void loadWithMediaEngine(); 357 void loadWithMediaEngine();
368 358
369 MediaPlayerClient* m_mediaPlayerClient; 359 MediaPlayerClient* m_mediaPlayerClient;
370 OwnPtr<MediaPlayerPrivateInterface> m_private; 360 OwnPtr<MediaPlayerPrivateInterface> m_private;
371 MediaPlayerFactory* m_currentMediaEngine; 361 MediaPlayerFactory* m_currentMediaEngine;
372 KURL m_url; 362 KURL m_url;
373 String m_contentMIMEType; 363 String m_contentMIMEType;
374 String m_contentTypeCodecs; 364 String m_contentTypeCodecs;
(...skipping 17 matching lines...) Expand all
392 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const String& keySystem, const KURL& url); 382 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const String& keySystem, const KURL& url);
393 #else 383 #else
394 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const KURL& url); 384 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const KURL& url);
395 #endif 385 #endif
396 386
397 typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupport sType); 387 typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupport sType);
398 388
399 } 389 }
400 390
401 #endif 391 #endif
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrack.cpp ('k') | Source/core/platform/graphics/MediaPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698