| Index: components/test_runner/test_plugin.h
|
| diff --git a/components/test_runner/test_plugin.h b/components/test_runner/test_plugin.h
|
| index b074b6eeb1d71dd9fe1bc6e355a21ffc496c55ff..4e595aae987a8ada01b40e13a2978d17ab9d312d 100644
|
| --- a/components/test_runner/test_plugin.h
|
| +++ b/components/test_runner/test_plugin.h
|
| @@ -17,6 +17,7 @@
|
| #include "third_party/WebKit/public/platform/WebLayer.h"
|
| #include "third_party/WebKit/public/web/WebPlugin.h"
|
| #include "third_party/WebKit/public/web/WebPluginContainer.h"
|
| +#include "third_party/khronos/GLES2/gl2.h"
|
|
|
| namespace blink {
|
| class WebFrame;
|
| @@ -109,12 +110,12 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
|
|
|
| struct Scene {
|
| Primitive primitive;
|
| - unsigned background_color[3];
|
| - unsigned primitive_color[3];
|
| + uint8_t background_color[3];
|
| + uint8_t primitive_color[3];
|
| float opacity;
|
|
|
| - unsigned vbo;
|
| - unsigned program;
|
| + GLuint vbo;
|
| + GLuint program;
|
| int color_location;
|
| int position_location;
|
|
|
| @@ -133,7 +134,7 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
|
|
|
| // Functions for parsing plugin parameters.
|
| Primitive ParsePrimitive(const blink::WebString& string);
|
| - void ParseColor(const blink::WebString& string, unsigned color[3]);
|
| + void ParseColor(const blink::WebString& string, uint8_t color[3]);
|
| float ParseOpacity(const blink::WebString& string);
|
| bool ParseBoolean(const blink::WebString& string);
|
|
|
| @@ -144,9 +145,9 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
|
| bool InitProgram();
|
| bool InitPrimitive();
|
| void DrawPrimitive();
|
| - unsigned LoadShader(unsigned type, const std::string& source);
|
| - unsigned LoadProgram(const std::string& vertex_source,
|
| - const std::string& fragment_source);
|
| + GLuint LoadShader(GLenum type, const std::string& source);
|
| + GLuint LoadProgram(const std::string& vertex_source,
|
| + const std::string& fragment_source);
|
|
|
| // Functions for drawing scene in Software.
|
| void DrawSceneSoftware(void* memory);
|
| @@ -159,11 +160,11 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
|
| scoped_ptr<blink::WebGraphicsContext3DProvider> context_provider_;
|
| blink::WebGraphicsContext3D* context_;
|
| gpu::gles2::GLES2Interface* gl_;
|
| - unsigned color_texture_;
|
| + GLuint color_texture_;
|
| cc::TextureMailbox texture_mailbox_;
|
| scoped_ptr<cc::SharedBitmap> shared_bitmap_;
|
| bool mailbox_changed_;
|
| - unsigned framebuffer_;
|
| + GLuint framebuffer_;
|
| Scene scene_;
|
| scoped_refptr<cc::TextureLayer> layer_;
|
| scoped_ptr<blink::WebLayer> web_layer_;
|
|
|