Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h - Issue 6460020: Merge 77608 - 2011-02-03 Victoria Kirst <vrk@google.com>...

Side by Side Diff: Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h

Issue 6460020: Merge 77608 - 2011-02-03 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 unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 Google Inc. All rights reserved.	2 * Copyright (C) 2010 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 int rgbaShaderMatrixLocation() const { return m_rgbaShaderMatrixLocation ; }	63 int rgbaShaderMatrixLocation() const { return m_rgbaShaderMatrixLocation ; }

64 int yuvWidthScaleFactorLocation() const { return m_yuvWidthScaleFactorLo cation; }	64 int yuvWidthScaleFactorLocation() const { return m_yuvWidthScaleFactorLo cation; }

65 int rgbaWidthScaleFactorLocation() const { return m_rgbaWidthScaleFactor Location; }	65 int rgbaWidthScaleFactorLocation() const { return m_rgbaWidthScaleFactor Location; }

66 int yTextureLocation() const { return m_yTextureLocation; }	66 int yTextureLocation() const { return m_yTextureLocation; }

67 int uTextureLocation() const { return m_uTextureLocation; }	67 int uTextureLocation() const { return m_uTextureLocation; }

68 int vTextureLocation() const { return m_vTextureLocation; }	68 int vTextureLocation() const { return m_vTextureLocation; }

69 int yuvAlphaLocation() const { return m_yuvAlphaLocation; }	69 int yuvAlphaLocation() const { return m_yuvAlphaLocation; }

70 int rgbaAlphaLocation() const { return m_rgbaAlphaLocation; }	70 int rgbaAlphaLocation() const { return m_rgbaAlphaLocation; }

71 int rgbaTextureLocation() const { return m_rgbaTextureLocation; }	71 int rgbaTextureLocation() const { return m_rgbaTextureLocation; }

72 int ccMatrixLocation() const { return m_ccMatrixLocation; }	72 int ccMatrixLocation() const { return m_ccMatrixLocation; }

	73 int signAdjLocation() const { return m_signAdjLocation; }

73 bool initialized() const { return m_initialized; }	74 bool initialized() const { return m_initialized; }

74 private:	75 private:

75 GraphicsContext3D* m_context;	76 GraphicsContext3D* m_context;

76 unsigned m_yuvShaderProgram;	77 unsigned m_yuvShaderProgram;

77 unsigned m_rgbaShaderProgram;	78 unsigned m_rgbaShaderProgram;

78 int m_yuvShaderMatrixLocation;	79 int m_yuvShaderMatrixLocation;

79 int m_yuvWidthScaleFactorLocation;	80 int m_yuvWidthScaleFactorLocation;

80 int m_rgbaShaderMatrixLocation;	81 int m_rgbaShaderMatrixLocation;

81 int m_rgbaWidthScaleFactorLocation;	82 int m_rgbaWidthScaleFactorLocation;

82 int m_ccMatrixLocation;	83 int m_ccMatrixLocation;

	84 int m_signAdjLocation;

83 int m_yTextureLocation;	85 int m_yTextureLocation;

84 int m_uTextureLocation;	86 int m_uTextureLocation;

85 int m_vTextureLocation;	87 int m_vTextureLocation;

86 int m_rgbaTextureLocation;	88 int m_rgbaTextureLocation;

87 int m_yuvAlphaLocation;	89 int m_yuvAlphaLocation;

88 int m_rgbaAlphaLocation;	90 int m_rgbaAlphaLocation;

89 bool m_initialized;	91 bool m_initialized;

90 };	92 };

91	93

92 protected:	94 protected:

(...skipping 22 matching lines...) Expand all Loading...
115	117

116 unsigned m_textures[3];	118 unsigned m_textures[3];

117 IntSize m_textureSizes[3];	119 IntSize m_textureSizes[3];

118 IntSize m_frameSizes[3];	120 IntSize m_frameSizes[3];

119 };	121 };

120	122

121 }	123 }

122 #endif // USE(ACCELERATED_COMPOSITING)	124 #endif // USE(ACCELERATED_COMPOSITING)

123	125

124 #endif	126 #endif

OLD	NEW

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp » ('j') | no next file with comments »