diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/HTMLMediaElement.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/HTMLMediaElement.h')
| -rw-r--r-- | Source/WebCore/html/HTMLMediaElement.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h index bdc3447..9778fd4 100644 --- a/Source/WebCore/html/HTMLMediaElement.h +++ b/Source/WebCore/html/HTMLMediaElement.h @@ -129,6 +129,12 @@ public: bool webkitClosedCaptionsVisible() const; void setWebkitClosedCaptionsVisible(bool); +#if ENABLE(MEDIA_STATISTICS) +// Statistics + unsigned long webkitAudioBytesDecoded() const; + unsigned long webkitVideoBytesDecoded() const; +#endif + // controls bool controls() const; void setControls(bool); @@ -152,7 +158,7 @@ public: void getPluginProxyParams(KURL& url, Vector<String>& names, Vector<String>& values); virtual void finishParsingChildren(); void createMediaPlayerProxy(); - void updateWidget(bool onlyCreateNonNetscapePlugins); + void updateWidget(PluginCreationOption); #endif bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSingleSecurityOrigin(); } |