Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h - Issue 6578030: Merge 78787 - 2011-02-16 Victoria Kirst <vrk@google.com>...

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: Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h

Issue 6578030: Merge 78787 - 2011-02-16 Victoria Kirst <vrk@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 years, 10 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

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h ('k') | Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h

===================================================================

--- Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h (revision 79604)

+++ Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h (working copy)

@@ -61,7 +61,8 @@

unsigned rgbaShaderProgram() const { return m_rgbaShaderProgram; }

int yuvShaderMatrixLocation() const { return m_yuvShaderMatrixLocation; }

int rgbaShaderMatrixLocation() const { return m_rgbaShaderMatrixLocation; }

- int yuvWidthScaleFactorLocation() const { return m_yuvWidthScaleFactorLocation; }

+ int yWidthScaleFactorLocation() const { return m_yWidthScaleFactorLocation; }

+ int uvWidthScaleFactorLocation() const { return m_uvWidthScaleFactorLocation; }

int rgbaWidthScaleFactorLocation() const { return m_rgbaWidthScaleFactorLocation; }

int yTextureLocation() const { return m_yTextureLocation; }

int uTextureLocation() const { return m_uTextureLocation; }

@@ -77,7 +78,8 @@

unsigned m_yuvShaderProgram;

unsigned m_rgbaShaderProgram;

int m_yuvShaderMatrixLocation;

- int m_yuvWidthScaleFactorLocation;

+ int m_yWidthScaleFactorLocation;

+ int m_uvWidthScaleFactorLocation;

int m_rgbaShaderMatrixLocation;

int m_rgbaWidthScaleFactorLocation;

int m_ccMatrixLocation;