diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:02:41 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:02:41 +0000 |
| commit | 075ae0349a2933720638ef085130efad774d9e37 (patch) | |
| tree | d6a9d3c7f3666431b0534781fd5f3bab1132dfa7 /cc/gl_renderer.h | |
| parent | 1bf5a67bf5b09f4338a5df92e3658250b65f8cd3 (diff) | |
| download | chromium_src-075ae0349a2933720638ef085130efad774d9e37.zip chromium_src-075ae0349a2933720638ef085130efad774d9e37.tar.gz chromium_src-075ae0349a2933720638ef085130efad774d9e37.tar.bz2 | |
cc: Replace WebCore::FloatQuad with gfx::QuadF.
It does as it says it does. This depends on the QuadF CL found at
https://codereview.chromium.org/11369043/ and is just search/replace
after that, as I added all the equivalent functionality to QuadF that
we made use of on FloatQuad.
It is possible we may see some slight differences in behaviour from using
FloatQuad, as we should benefit from increased precision, using doubles after
multiplying floats, when using Contains(Point) or IsCounterClockwise().
Covered by existing tests; no dramatic change in behaviour.
R=enne
BUG=147395
Review URL: https://codereview.chromium.org/11364044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer.h')
| -rw-r--r-- | cc/gl_renderer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index cb03c06..7d39f18 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -14,6 +14,7 @@ #include "cc/solid_color_draw_quad.h" #include "cc/tile_draw_quad.h" #include "cc/yuv_video_draw_quad.h" +#include "ui/gfx/quad_f.h" namespace WebKit { class WebGraphicsContext3D; @@ -66,7 +67,7 @@ protected: bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; } bool initialize(); - const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; } + const gfx::QuadF& sharedGeometryQuad() const { return m_sharedGeometryQuad; } const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); } bool getFramebufferTexture(ScopedTexture*, const gfx::Rect& deviceRect); @@ -99,7 +100,7 @@ private: void drawYUVVideoQuad(const DrawingFrame&, const YUVVideoDrawQuad*); void setShaderOpacity(float opacity, int alphaLocation); - void setShaderFloatQuad(const FloatQuad&, int quadLocation); + void setShaderQuadF(const gfx::QuadF&, int quadLocation); void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const gfx::RectF& quadRect, int matrixLocation); void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const WebKit::WebTransformationMatrix& drawMatrix); @@ -129,7 +130,7 @@ private: unsigned m_offscreenFramebufferId; scoped_ptr<GeometryBinding> m_sharedGeometry; - FloatQuad m_sharedGeometryQuad; + gfx::QuadF m_sharedGeometryQuad; // This block of bindings defines all of the programs used by the compositor itself. |