Chromium Code Reviews| Index: components/test_runner/test_plugin.h |
| diff --git a/components/test_runner/test_plugin.h b/components/test_runner/test_plugin.h |
| index cc91cbd75f9b4a40e3a9690d1b8e1790a3abf77a..8f578d0f60e1aa381a10a9d31ac97f4fae85e3cc 100644 |
| --- a/components/test_runner/test_plugin.h |
| +++ b/components/test_runner/test_plugin.h |
| @@ -108,12 +108,12 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient { |
| struct Scene { |
| Primitive primitive; |
| - unsigned background_color[3]; |
| - unsigned primitive_color[3]; |
| + uint32_t background_color[3]; |
| + uint32_t primitive_color[3]; |
| float opacity; |
| - unsigned vbo; |
| - unsigned program; |
| + uint32_t vbo; |
| + uint32_t program; |
| int color_location; |
| int position_location; |
| @@ -132,7 +132,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, uint32_t color[3]); |
| float ParseOpacity(const blink::WebString& string); |
| bool ParseBoolean(const blink::WebString& string); |
| @@ -143,8 +143,8 @@ 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, |
| + uint32_t LoadShader(uint32_t type, const std::string& source); |
| + uint32_t LoadProgram(const std::string& vertex_source, |
| const std::string& fragment_source); |
| // Functions for drawing scene in Software. |
| @@ -157,11 +157,11 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient { |
| blink::WebRect rect_; |
| blink::WebGraphicsContext3D* context_; |
| gpu::gles2::GLES2Interface* gl_; |
| - unsigned color_texture_; |
| + uint32_t color_texture_; |
|
Ken Russell (switch to Gerrit)
2016/03/19 01:46:39
Seems a little strange to use uint32_t for an Open
danakj
2016/03/21 22:27:02
Done.
|
| cc::TextureMailbox texture_mailbox_; |
| scoped_ptr<cc::SharedBitmap> shared_bitmap_; |
| bool mailbox_changed_; |
| - unsigned framebuffer_; |
| + uint32_t framebuffer_; |
| Scene scene_; |
| scoped_refptr<cc::TextureLayer> layer_; |
| scoped_ptr<blink::WebLayer> web_layer_; |