| Index: third_party/WebKit/Source/modules/webgl/WebGLObject.h
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLObject.h b/third_party/WebKit/Source/modules/webgl/WebGLObject.h
|
| index b581e326c8afdb0a5610d965c6bf49638bf22fb0..e10a80a27681a09654d840454645ba479a7fdf90 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLObject.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLObject.h
|
| @@ -29,6 +29,7 @@
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "platform/graphics/GraphicsTypes3D.h"
|
| #include "platform/heap/Handle.h"
|
| +#include "wtf/Assertions.h"
|
| #include "wtf/RefCounted.h"
|
|
|
| namespace blink {
|
| @@ -47,11 +48,19 @@ class WebGLContextGroup;
|
| class WebGLRenderingContextBase;
|
|
|
| template <typename T>
|
| -Platform3DObject objectOrZero(const T* object)
|
| +GLuint objectOrZero(const T* object)
|
| {
|
| return object ? object->object() : 0;
|
| }
|
|
|
| +template <typename T>
|
| +GLuint objectNonZero(const T* object)
|
| +{
|
| + GLuint result = object->object();
|
| + DCHECK(result);
|
| + return result;
|
| +}
|
| +
|
| class WebGLObject : public GarbageCollectedFinalized<WebGLObject>, public ScriptWrappable {
|
| public:
|
| virtual ~WebGLObject();
|
|
|