| Index: webkit/api/src/WebMediaPlayerClientImpl.h
|
| ===================================================================
|
| --- webkit/api/src/WebMediaPlayerClientImpl.h (revision 22811)
|
| +++ webkit/api/src/WebMediaPlayerClientImpl.h (working copy)
|
| @@ -90,6 +90,8 @@
|
| virtual unsigned bytesLoaded() const;
|
| virtual void setSize(const WebCore::IntSize&);
|
| virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
|
| + virtual bool hasSingleSecurityOrigin() const;
|
| + virtual WebCore::MediaPlayer::MovieLoadType movieLoadType() const;
|
|
|
| private:
|
| WebMediaPlayerClientImpl();
|
|
|
| Property changes on: webkit\api\src\WebMediaPlayerClientImpl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /trunk/src/webkit/api/src/WebMediaPlayerClientImpl.h:r21999
|
| Merged /branches/chrome_webkit_merge_branch/deps/third_party/WebKit/WebKit/chromium/src/WebMediaPlayerClientImpl.h:r3734-4214,4606-5108,5177-5263
|
|
|
|
|