| Index: cc/geometry_binding.cc
|
| diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
|
| index b8116d79bb888644f8009e630bcc9a6a44fa64cb..89fda4398a3d1d6cdca21e391f0d5f975767b50d 100644
|
| --- a/cc/geometry_binding.cc
|
| +++ b/cc/geometry_binding.cc
|
| @@ -8,21 +8,22 @@
|
|
|
| #include "cc/gl_renderer.h" // For the GLC() macro.
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| +#include "ui/gfx/rect_f.h"
|
| #include <public/WebGraphicsContext3D.h>
|
|
|
| namespace cc {
|
|
|
| -GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, const FloatRect& quadVertexRect)
|
| +GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, const gfx::RectF& quadVertexRect)
|
| : m_context(context)
|
| , m_quadVerticesVbo(0)
|
| , m_quadElementsVbo(0)
|
| , m_initialized(false)
|
| {
|
| // Vertex positions and texture coordinates for the 4 corners of a 1x1 quad.
|
| - float vertices[] = { quadVertexRect.x(), quadVertexRect.maxY(), 0.0f, 0.0f, 1.0f,
|
| + float vertices[] = { quadVertexRect.x(), quadVertexRect.bottom(), 0.0f, 0.0f, 1.0f,
|
| quadVertexRect.x(), quadVertexRect.y(), 0.0f, 0.0f, 0.0f,
|
| - quadVertexRect.maxX(), quadVertexRect.y(), 0.0f, 1.0f, 0.0f,
|
| - quadVertexRect.maxX(), quadVertexRect.maxY(), 0.0f, 1.0f, 1.0f };
|
| + quadVertexRect.right(), quadVertexRect.y(), 0.0f, 1.0f, 0.0f,
|
| + quadVertexRect.right(), quadVertexRect.bottom(), 0.0f, 1.0f, 1.0f };
|
| uint16_t indices[] = { 0, 1, 2, 0, 2, 3, // The two triangles that make up the layer quad.
|
| 0, 1, 2, 3}; // A line path for drawing the layer border.
|
|
|
|
|