diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/graphics/MediaPlayerPrivate.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/graphics/MediaPlayerPrivate.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/MediaPlayerPrivate.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/MediaPlayerPrivate.h b/Source/WebCore/platform/graphics/MediaPlayerPrivate.h index 04b2612..b4490bc 100644 --- a/Source/WebCore/platform/graphics/MediaPlayerPrivate.h +++ b/Source/WebCore/platform/graphics/MediaPlayerPrivate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -136,10 +136,16 @@ public: // it is OK to calculate movie time before refreshing the cached time. virtual double maximumDurationToCacheMediaTime() const { return 0; } - virtual unsigned long decodedFrames() const { return 0; } - virtual unsigned long droppedFrames() const { return 0; } - virtual unsigned long audioBytesDecoded() const { return 0; } - virtual unsigned long videoBytesDecoded() const { return 0; } + virtual unsigned decodedFrameCount() const { return 0; } + virtual unsigned droppedFrameCount() const { return 0; } + virtual unsigned audioDecodedByteCount() const { return 0; } + virtual unsigned videoDecodedByteCount() const { return 0; } + + void getSitesInMediaCache(Vector<String>&) { } + void clearMediaCache() { } + void clearMediaCacheForSite(const String&) { } + + virtual void setPrivateBrowsingMode(bool) { } }; } |