diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp b/chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp index da27596f273..76ef482e037 100644 --- a/chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp +++ b/chromium/third_party/WebKit/Source/core/html/canvas/WebGLRenderbuffer.cpp @@ -27,11 +27,11 @@ #include "core/html/canvas/WebGLRenderbuffer.h" -#include "core/html/canvas/WebGLRenderingContext.h" +#include "core/html/canvas/WebGLRenderingContextBase.h" namespace WebCore { -PassRefPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderingContext* ctx) +PassRefPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderingContextBase* ctx) { return adoptRef(new WebGLRenderbuffer(ctx)); } @@ -41,25 +41,24 @@ WebGLRenderbuffer::~WebGLRenderbuffer() deleteObject(0); } -WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContext* ctx) +WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) : WebGLSharedObject(ctx) , m_internalFormat(GL_RGBA4) - , m_initialized(false) , m_width(0) , m_height(0) , m_hasEverBeenBound(false) { ScriptWrappable::init(this); - setObject(ctx->graphicsContext3D()->createRenderbuffer()); + setObject(ctx->webContext()->createRenderbuffer()); } -void WebGLRenderbuffer::deleteObjectImpl(GraphicsContext3D* context3d, Platform3DObject object) +void WebGLRenderbuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platform3DObject object) { context3d->deleteRenderbuffer(object); deleteEmulatedStencilBuffer(context3d); } -void WebGLRenderbuffer::deleteEmulatedStencilBuffer(GraphicsContext3D* context3d) +void WebGLRenderbuffer::deleteEmulatedStencilBuffer(blink::WebGraphicsContext3D* context3d) { if (!m_emulatedStencilBuffer) return; |