cc/video_layer_impl.h - Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/video_layer_impl.h

Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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: cc/video_layer_impl.h

diff --git a/cc/video_layer_impl.h b/cc/video_layer_impl.h

index b254e8c50b0d3b59241c6a09cbe9158e1868f166..63f062520c49f1d3fbbfd4e20620fbcf1e2dbd4e 100644

--- a/cc/video_layer_impl.h

+++ b/cc/video_layer_impl.h

@@ -6,7 +6,7 @@

#define CCVideoLayerImpl_h

#include "CCLayerImpl.h"

-#include "GraphicsContext3D.h"

+#include "third_party/khronos/GLES2/gl2.h"

#include "IntSize.h"

#include <public/WebTransformationMatrix.h>

#include <public/WebVideoFrameProvider.h>

@@ -49,7 +49,7 @@ public:

struct FramePlane {

CCResourceProvider::ResourceId resourceId;

IntSize size;

- GC3Denum format;

+ GLenum format;

IntSize visibleSize;

FramePlane() : resourceId(0) { }

@@ -77,7 +77,7 @@ private:

WebKit::WebTransformationMatrix m_streamTextureMatrix;

WebKit::WebVideoFrame* m_frame;

- GC3Denum m_format;

+ GLenum m_format;

CCResourceProvider::ResourceId m_externalTextureResource;

// Each index in this array corresponds to a plane in WebKit::WebVideoFrame.

« no previous file with comments | « cc/tiled_layer_impl.cc ('k') | cc/video_layer_impl.cc » ('j') | no next file with comments »