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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void releaseCurrentFrame(); 54 void releaseCurrentFrame();
55 55
56 class SharedValues { 56 class SharedValues {
57 public: 57 public:
58 explicit SharedValues(GraphicsContext3D*); 58 explicit SharedValues(GraphicsContext3D*);
59 ~SharedValues(); 59 ~SharedValues();
60 unsigned yuvShaderProgram() const { return m_yuvShaderProgram; } 60 unsigned yuvShaderProgram() const { return m_yuvShaderProgram; }
61 unsigned rgbaShaderProgram() const { return m_rgbaShaderProgram; } 61 unsigned rgbaShaderProgram() const { return m_rgbaShaderProgram; }
62 int yuvShaderMatrixLocation() const { return m_yuvShaderMatrixLocation; } 62 int yuvShaderMatrixLocation() const { return m_yuvShaderMatrixLocation; }
63 int rgbaShaderMatrixLocation() const { return m_rgbaShaderMatrixLocation ; } 63 int rgbaShaderMatrixLocation() const { return m_rgbaShaderMatrixLocation ; }
64 int yuvWidthScaleFactorLocation() const { return m_yuvWidthScaleFactorLo cation; } 64 int yWidthScaleFactorLocation() const { return m_yWidthScaleFactorLocati on; }
65 int uvWidthScaleFactorLocation() const { return m_uvWidthScaleFactorLoca tion; }
65 int rgbaWidthScaleFactorLocation() const { return m_rgbaWidthScaleFactor Location; } 66 int rgbaWidthScaleFactorLocation() const { return m_rgbaWidthScaleFactor Location; }
66 int yTextureLocation() const { return m_yTextureLocation; } 67 int yTextureLocation() const { return m_yTextureLocation; }
67 int uTextureLocation() const { return m_uTextureLocation; } 68 int uTextureLocation() const { return m_uTextureLocation; }
68 int vTextureLocation() const { return m_vTextureLocation; } 69 int vTextureLocation() const { return m_vTextureLocation; }
69 int yuvAlphaLocation() const { return m_yuvAlphaLocation; } 70 int yuvAlphaLocation() const { return m_yuvAlphaLocation; }
70 int rgbaAlphaLocation() const { return m_rgbaAlphaLocation; } 71 int rgbaAlphaLocation() const { return m_rgbaAlphaLocation; }
71 int rgbaTextureLocation() const { return m_rgbaTextureLocation; } 72 int rgbaTextureLocation() const { return m_rgbaTextureLocation; }
72 int ccMatrixLocation() const { return m_ccMatrixLocation; } 73 int ccMatrixLocation() const { return m_ccMatrixLocation; }
73 int signAdjLocation() const { return m_signAdjLocation; } 74 int signAdjLocation() const { return m_signAdjLocation; }
74 bool initialized() const { return m_initialized; } 75 bool initialized() const { return m_initialized; }
75 private: 76 private:
76 GraphicsContext3D* m_context; 77 GraphicsContext3D* m_context;
77 unsigned m_yuvShaderProgram; 78 unsigned m_yuvShaderProgram;
78 unsigned m_rgbaShaderProgram; 79 unsigned m_rgbaShaderProgram;
79 int m_yuvShaderMatrixLocation; 80 int m_yuvShaderMatrixLocation;
80 int m_yuvWidthScaleFactorLocation; 81 int m_yWidthScaleFactorLocation;
82 int m_uvWidthScaleFactorLocation;
81 int m_rgbaShaderMatrixLocation; 83 int m_rgbaShaderMatrixLocation;
82 int m_rgbaWidthScaleFactorLocation; 84 int m_rgbaWidthScaleFactorLocation;
83 int m_ccMatrixLocation; 85 int m_ccMatrixLocation;
84 int m_signAdjLocation; 86 int m_signAdjLocation;
85 int m_yTextureLocation; 87 int m_yTextureLocation;
86 int m_uTextureLocation; 88 int m_uTextureLocation;
87 int m_vTextureLocation; 89 int m_vTextureLocation;
88 int m_rgbaTextureLocation; 90 int m_rgbaTextureLocation;
89 int m_yuvAlphaLocation; 91 int m_yuvAlphaLocation;
90 int m_rgbaAlphaLocation; 92 int m_rgbaAlphaLocation;
(...skipping 26 matching lines...) Expand all
117 119
118 unsigned m_textures[3]; 120 unsigned m_textures[3];
119 IntSize m_textureSizes[3]; 121 IntSize m_textureSizes[3];
120 IntSize m_frameSizes[3]; 122 IntSize m_frameSizes[3];
121 }; 123 };
122 124
123 } 125 }
124 #endif // USE(ACCELERATED_COMPOSITING) 126 #endif // USE(ACCELERATED_COMPOSITING)
125 127
126 #endif 128 #endif
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698