| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 119 |
| 120 // Methods for painting. | 120 // Methods for painting. |
| 121 // FIXME: This path "only works" on Android. It is a workaround for the | 121 // FIXME: This path "only works" on Android. It is a workaround for the |
| 122 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture | 122 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture |
| 123 // internally. It should be removed and replaced by the normal paint path. | 123 // internally. It should be removed and replaced by the normal paint path. |
| 124 // https://code.google.com/p/skia/issues/detail?id=1189 | 124 // https://code.google.com/p/skia/issues/detail?id=1189 |
| 125 virtual void paint(blink::WebCanvas* canvas, | 125 virtual void paint(blink::WebCanvas* canvas, |
| 126 const blink::WebRect& rect, | 126 const blink::WebRect& rect, |
| 127 unsigned char alpha, | 127 unsigned char alpha, |
| 128 SkXfermode::Mode mode); | 128 SkXfermode::Mode mode); |
| 129 // TODO(dshwang): remove it because above method replaces. crbug.com/401027 | |
| 130 virtual void paint(blink::WebCanvas* canvas, | |
| 131 const blink::WebRect& rect, | |
| 132 unsigned char alpha); | |
| 133 | 129 |
| 134 virtual bool copyVideoTextureToPlatformTexture( | 130 virtual bool copyVideoTextureToPlatformTexture( |
| 135 blink::WebGraphicsContext3D* web_graphics_context, | 131 blink::WebGraphicsContext3D* web_graphics_context, |
| 136 unsigned int texture, | 132 unsigned int texture, |
| 137 unsigned int level, | 133 unsigned int level, |
| 138 unsigned int internal_format, | 134 unsigned int internal_format, |
| 139 unsigned int type, | 135 unsigned int type, |
| 140 bool premultiply_alpha, | 136 bool premultiply_alpha, |
| 141 bool flip_y); | 137 bool flip_y); |
| 142 | 138 |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 | 502 |
| 507 // NOTE: Weak pointers must be invalidated before all other member variables. | 503 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 508 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 504 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 509 | 505 |
| 510 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 506 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 511 }; | 507 }; |
| 512 | 508 |
| 513 } // namespace content | 509 } // namespace content |
| 514 | 510 |
| 515 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 511 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |