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/WebKit/chromium/src/VideoFrameChromiumImpl.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/WebKit/chromium/src/VideoFrameChromiumImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/VideoFrameChromiumImpl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/VideoFrameChromiumImpl.h b/Source/WebKit/chromium/src/VideoFrameChromiumImpl.h index f86ee1c..ca7f88b 100644 --- a/Source/WebKit/chromium/src/VideoFrameChromiumImpl.h +++ b/Source/WebKit/chromium/src/VideoFrameChromiumImpl.h @@ -52,12 +52,15 @@ public: virtual SurfaceType surfaceType() const; virtual Format format() const; virtual unsigned width() const; + virtual unsigned width(unsigned plane) const; virtual unsigned height() const; + virtual unsigned height(unsigned plane) const; virtual unsigned planes() const; virtual int stride(unsigned plane) const; virtual const void* data(unsigned plane) const; virtual unsigned texture(unsigned plane) const; virtual const IntSize requiredTextureSize(unsigned plane) const; + virtual bool hasPaddingBytes(unsigned plane) const; private: WebVideoFrame* m_webVideoFrame; |