Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: components/test_runner/test_plugin.h

Issue 1817323003: Revert of Remove create/delete methods from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@complex-casts
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/test_runner/DEPS ('k') | components/test_runner/test_plugin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/test_plugin.h
diff --git a/components/test_runner/test_plugin.h b/components/test_runner/test_plugin.h
index 9e43babad3c3a1bab711d1325ccd43587dad0fe4..cc91cbd75f9b4a40e3a9690d1b8e1790a3abf77a 100644
--- a/components/test_runner/test_plugin.h
+++ b/components/test_runner/test_plugin.h
@@ -17,7 +17,6 @@
#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 +108,12 @@
struct Scene {
Primitive primitive;
- uint8_t background_color[3];
- uint8_t primitive_color[3];
+ unsigned background_color[3];
+ unsigned primitive_color[3];
float opacity;
- GLuint vbo;
- GLuint program;
+ unsigned vbo;
+ unsigned program;
int color_location;
int position_location;
@@ -133,7 +132,7 @@
// Functions for parsing plugin parameters.
Primitive ParsePrimitive(const blink::WebString& string);
- void ParseColor(const blink::WebString& string, uint8_t color[3]);
+ void ParseColor(const blink::WebString& string, unsigned color[3]);
float ParseOpacity(const blink::WebString& string);
bool ParseBoolean(const blink::WebString& string);
@@ -144,9 +143,9 @@
bool InitProgram();
bool InitPrimitive();
void DrawPrimitive();
- GLuint LoadShader(GLenum type, const std::string& source);
- GLuint LoadProgram(const std::string& vertex_source,
- const std::string& fragment_source);
+ unsigned LoadShader(unsigned type, const std::string& source);
+ unsigned LoadProgram(const std::string& vertex_source,
+ const std::string& fragment_source);
// Functions for drawing scene in Software.
void DrawSceneSoftware(void* memory);
@@ -158,11 +157,11 @@
blink::WebRect rect_;
blink::WebGraphicsContext3D* context_;
gpu::gles2::GLES2Interface* gl_;
- GLuint color_texture_;
+ unsigned color_texture_;
cc::TextureMailbox texture_mailbox_;
scoped_ptr<cc::SharedBitmap> shared_bitmap_;
bool mailbox_changed_;
- GLuint framebuffer_;
+ unsigned framebuffer_;
Scene scene_;
scoped_refptr<cc::TextureLayer> layer_;
scoped_ptr<blink::WebLayer> web_layer_;
« no previous file with comments | « components/test_runner/DEPS ('k') | components/test_runner/test_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698