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

Side by Side Diff: Source/modules/webgl/WebGLBuffer.cpp

Issue 1281953003: Revert of [Oilpan] Migrate classes under module/webgl onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « Source/modules/webgl/WebGLBuffer.h ('k') | Source/modules/webgl/WebGLBuffer.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "modules/webgl/WebGLBuffer.h" 28 #include "modules/webgl/WebGLBuffer.h"
29 29
30 #include "modules/webgl/WebGLRenderingContextBase.h" 30 #include "modules/webgl/WebGLRenderingContextBase.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 WebGLBuffer* WebGLBuffer::create(WebGLRenderingContextBase* ctx) 34 PassRefPtrWillBeRawPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBas e* ctx)
35 { 35 {
36 return new WebGLBuffer(ctx); 36 return adoptRefWillBeNoop(new WebGLBuffer(ctx));
37 } 37 }
38 38
39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx)
40 : WebGLSharedPlatform3DObject(ctx) 40 : WebGLSharedPlatform3DObject(ctx)
41 , m_initialTarget(0) 41 , m_initialTarget(0)
42 { 42 {
43 setObject(ctx->webContext()->createBuffer()); 43 setObject(ctx->webContext()->createBuffer());
44 } 44 }
45 45
46 WebGLBuffer::~WebGLBuffer() 46 WebGLBuffer::~WebGLBuffer()
47 { 47 {
48 // See the comment in WebGLObject::detachAndDeleteObject(). 48 // Delete the buffer's platform object. This object will have been
49 // detached from the WebGLContextGroup if the group object was
50 // finalized first. With Oilpan not enabled, it always will be,
51 // but with Oilpan enabled, the WebGLBuffer might end up being
52 // finalized first. In which case detachment is needed to ensure
53 // that the platform object is indeed deleted.
54 //
55 // To keep the code regular, the trivial detach()ment is always
56 // performed.
49 detachAndDeleteObject(); 57 detachAndDeleteObject();
50 } 58 }
51 59
52 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d) 60 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d)
53 { 61 {
54 context3d->deleteBuffer(m_object); 62 context3d->deleteBuffer(m_object);
55 m_object = 0; 63 m_object = 0;
56 } 64 }
57 65
58 void WebGLBuffer::setInitialTarget(GLenum target) 66 void WebGLBuffer::setInitialTarget(GLenum target)
59 { 67 {
60 // WebGL restricts the ability to bind buffers to multiple targets based on 68 // WebGL restricts the ability to bind buffers to multiple targets based on
61 // it's initial bind point. 69 // it's initial bind point.
62 ASSERT(!m_initialTarget); 70 ASSERT(!m_initialTarget);
63 m_initialTarget = target; 71 m_initialTarget = target;
64 } 72 }
65 73
66 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLBuffer.h ('k') | Source/modules/webgl/WebGLBuffer.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698