OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <jni.h> | 9 #include <jni.h> |
10 | 10 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
43 WebMediaPlayerAndroid(WebKit::WebFrame* frame, | 43 WebMediaPlayerAndroid(WebKit::WebFrame* frame, |
44 WebKit::WebMediaPlayerClient* client, | 44 WebKit::WebMediaPlayerClient* client, |
45 WebKit::WebCookieJar* cookie_jar, | 45 WebKit::WebCookieJar* cookie_jar, |
46 webkit_media::WebMediaPlayerManagerAndroid* manager, | 46 webkit_media::WebMediaPlayerManagerAndroid* manager, |
47 webkit_media::StreamTextureFactory* factory); | 47 webkit_media::StreamTextureFactory* factory); |
48 virtual ~WebMediaPlayerAndroid(); | 48 virtual ~WebMediaPlayerAndroid(); |
49 | 49 |
50 // Set |incognito_mode_| to true if in incognito mode. | 50 // Set |incognito_mode_| to true if in incognito mode. |
51 static void InitIncognito(bool incognito_mode); | 51 static void InitIncognito(bool incognito_mode); |
52 | 52 |
53 // TODO(fischman): remove the single-param version once WebKit stops calling | |
54 // it. | |
55 virtual void load(const WebKit::WebURL& url); | |
53 // Resource loading. | 56 // Resource loading. |
54 virtual void load(const WebKit::WebURL& url); | 57 virtual void load(const WebKit::WebURL& url, |
58 bool has_cross_origin_attr, | |
59 const WebKit::WebString& cross_origin_attr); | |
scherkus (not reviewing)
2012/06/06 00:44:36
CrossOriginAttribute cross_origin_attribute instea
| |
55 virtual void cancelLoad(); | 60 virtual void cancelLoad(); |
56 | 61 |
57 // Playback controls. | 62 // Playback controls. |
58 virtual void play(); | 63 virtual void play(); |
59 virtual void pause(); | 64 virtual void pause(); |
60 virtual void seek(float seconds); | 65 virtual void seek(float seconds); |
61 virtual bool supportsFullscreen() const; | 66 virtual bool supportsFullscreen() const; |
62 virtual bool supportsSave() const; | 67 virtual bool supportsSave() const; |
63 virtual void setEndTime(float seconds); | 68 virtual void setEndTime(float seconds); |
64 virtual void setRate(float rate); | 69 virtual void setRate(float rate); |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
235 // Object for calling back the compositor thread to repaint the video when a | 240 // Object for calling back the compositor thread to repaint the video when a |
236 // frame available. It should be initialized on the compositor thread. | 241 // frame available. It should be initialized on the compositor thread. |
237 scoped_ptr<webkit_media::StreamTextureProxy> stream_texture_proxy_; | 242 scoped_ptr<webkit_media::StreamTextureProxy> stream_texture_proxy_; |
238 | 243 |
239 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 244 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
240 }; | 245 }; |
241 | 246 |
242 } // namespace webkit_media | 247 } // namespace webkit_media |
243 | 248 |
244 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 249 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |