Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1493)

Unified Diff: third_party/WebKit/Source/core/html/HTMLVideoElement.h

Issue 1950763002: Remove abstractions around GLuint and GL constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLVideoElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLVideoElement.h b/third_party/WebKit/Source/core/html/HTMLVideoElement.h
index f053825d96e0f063a267f039e7070cefe9a319ce..d1ab80cc4c4a113e7b3f2610ea78311959270ca5 100644
--- a/third_party/WebKit/Source/core/html/HTMLVideoElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLVideoElement.h
@@ -31,7 +31,7 @@
#include "core/html/HTMLMediaElement.h"
#include "core/html/canvas/CanvasImageSource.h"
#include "core/imagebitmap/ImageBitmapSource.h"
-#include "platform/graphics/GraphicsTypes3D.h"
+#include "third_party/khronos/GLES2/gl2.h"
class SkPaint;
@@ -46,12 +46,6 @@ class ExceptionState;
class GraphicsContext;
class ImageBitmapOptions;
-// GL types as defined in OpenGL ES 2.0 header file gl2.h from khronos.org.
-// That header cannot be included directly due to a conflict with NPAPI headers.
-// See crbug.com/328085.
-typedef unsigned GLenum;
-typedef int GC3Dint;
-
class CORE_EXPORT HTMLVideoElement final : public HTMLMediaElement, public CanvasImageSource, public ImageBitmapSource {
DEFINE_WRAPPERTYPEINFO();
public:
@@ -76,7 +70,7 @@ public:
void paintCurrentFrame(SkCanvas*, const IntRect&, const SkPaint*) const;
// Used by WebGL to do GPU-GPU textures copy if possible.
- bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*, Platform3DObject texture, GLenum internalFormat, GLenum type, bool premultiplyAlpha, bool flipY);
+ bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*, GLuint texture, GLenum internalFormat, GLenum type, bool premultiplyAlpha, bool flipY);
bool shouldDisplayPosterImage() const { return getDisplayMode() == Poster; }
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils.cc ('k') | third_party/WebKit/Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698