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

Side by Side Diff: Source/core/html/canvas/WebGLBuffer.cpp

Issue 365653002: Oilpan: move 2D Canvas and WebGL objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Smaller adjustments Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "core/html/canvas/WebGLBuffer.h" 28 #include "core/html/canvas/WebGLBuffer.h"
29 29
30 #include "core/html/canvas/WebGLRenderingContextBase.h" 30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 PassRefPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBase* ctx) 34 PassRefPtrWillBeRawPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBas e* ctx)
35 { 35 {
36 return adoptRef(new WebGLBuffer(ctx)); 36 return adoptRefWillBeNoop(new WebGLBuffer(ctx));
37 } 37 }
38 38
39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx)
40 : WebGLSharedObject(ctx) 40 : WebGLSharedObject(ctx)
41 , m_target(0) 41 , m_target(0)
42 { 42 {
43 ScriptWrappable::init(this); 43 ScriptWrappable::init(this);
44 setObject(ctx->webContext()->createBuffer()); 44 setObject(ctx->webContext()->createBuffer());
45 } 45 }
46 46
47 WebGLBuffer::~WebGLBuffer() 47 WebGLBuffer::~WebGLBuffer()
48 { 48 {
49 deleteObject(0); 49 // Delete the buffer's platform object. This object will have been
50 // detached from the WebGLContextGroup if the group object was
51 // finalized first. With Oilpan not enabled, it always will be,
52 // but with Oilpan enabled, the WebGLBuffer might end up being
53 // finalized first. In which case detachment is needed to ensure
54 // that the platform object is indeed deleted.
55 //
56 // To keep the code regular, the trivial detach()ment is always
57 // performed.
58 detachAndDeleteObject();
50 } 59 }
51 60
52 void WebGLBuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object) 61 void WebGLBuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object)
53 { 62 {
54 context3d->deleteBuffer(object); 63 context3d->deleteBuffer(object);
55 } 64 }
56 65
57 void WebGLBuffer::setTarget(GLenum target) 66 void WebGLBuffer::setTarget(GLenum target)
58 { 67 {
59 // In WebGL, a buffer is bound to one target in its lifetime 68 // In WebGL, a buffer is bound to one target in its lifetime
60 if (m_target) 69 if (m_target)
61 return; 70 return;
62 if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER) 71 if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER)
63 m_target = target; 72 m_target = target;
64 } 73 }
65 74
66 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698