Texture Draw Calls Coalescing

cc/geometry_binding.h

Index: cc/geometry_binding.h
diff --git a/cc/geometry_binding.h b/cc/geometry_binding.h
index 717ec6b099a84abd14babdc6f29257f755b705cd..bb5cb3bbe5abf18c3a5674152fda6d54068ad7b1 100644
--- a/cc/geometry_binding.h
+++ b/cc/geometry_binding.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_GEOMETRY_BINDING_H_
-#define CC_GEOMETRY_BINDING_H_
+#ifndef GeometryBinding_h

[jamesr, 2012/11/28 00:00:37]

I think this change is unintentional - we want CC_GEOMETRY_BINDING_H_ here since
that matches chromium style

[whunt, 2012/11/28 22:01:15]

I'll change that.  I hadn't touched that line before to my knowledge, perhaps it
was part of one of the merges.

On 2012/11/28 00:00:37, jamesr wrote:

+#define GeometryBinding_h
 
 namespace gfx {
 class RectF;
@@ -25,6 +25,7 @@ public:
     WebKit::WebGraphicsContext3D* context() const { return m_context; }
     unsigned quadVerticesVbo() const { return m_quadVerticesVbo; }
     unsigned quadElementsVbo() const { return m_quadElementsVbo; }
+    unsigned quadListVerticesVbo() const { return m_quadListVerticesVbo; }
 
     void prepareForDraw();
 
@@ -33,14 +34,17 @@ public:
     // rebinding attribute arrays.
     static int positionAttribLocation() { return 0; }
     static int texCoordAttribLocation() { return 1; }
+    static int triangleIndexAttribLocation() { return 2; }
 
 private:
     WebKit::WebGraphicsContext3D* m_context;
+    bool m_initialized;
+
     unsigned m_quadVerticesVbo;
     unsigned m_quadElementsVbo;
-    bool m_initialized;
+    unsigned m_quadListVerticesVbo;
 };
 
 } // namespace cc
 
-#endif  // CC_GEOMETRY_BINDING_H_
+#endif