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

Side by Side Diff: Source/modules/webgl/WebGLQuery.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/WebGLQuery.h ('k') | Source/modules/webgl/WebGLQuery.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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "modules/webgl/WebGLQuery.h" 7 #include "modules/webgl/WebGLQuery.h"
8 8
9 #include "modules/webgl/WebGL2RenderingContextBase.h" 9 #include "modules/webgl/WebGL2RenderingContextBase.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 WebGLQuery* WebGLQuery::create(WebGL2RenderingContextBase* ctx) 13 PassRefPtrWillBeRawPtr<WebGLQuery> WebGLQuery::create(WebGL2RenderingContextBase * ctx)
14 { 14 {
15 return new WebGLQuery(ctx); 15 return adoptRefWillBeNoop(new WebGLQuery(ctx));
16 } 16 }
17 17
18 WebGLQuery::~WebGLQuery() 18 WebGLQuery::~WebGLQuery()
19 { 19 {
20 // See the comment in WebGLObject::detachAndDeleteObject(). 20 // Always call detach here to ensure that platform object deletion
21 // happens with Oilpan enabled. It keeps the code regular to do it
22 // with or without Oilpan enabled.
23 //
24 // See comment in WebGLBuffer's destructor for additional
25 // information on why this is done for WebGLSharedObject-derived
26 // objects.
21 detachAndDeleteObject(); 27 detachAndDeleteObject();
22 } 28 }
23 29
24 WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx) 30 WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx)
25 : WebGLSharedPlatform3DObject(ctx) 31 : WebGLSharedPlatform3DObject(ctx)
26 , m_target(0) 32 , m_target(0)
27 { 33 {
28 setObject(ctx->webContext()->createQueryEXT()); 34 setObject(ctx->webContext()->createQueryEXT());
29 } 35 }
30 36
31 void WebGLQuery::setTarget(GLenum target) 37 void WebGLQuery::setTarget(GLenum target)
32 { 38 {
33 ASSERT(object()); 39 ASSERT(object());
34 ASSERT(!m_target); 40 ASSERT(!m_target);
35 m_target = target; 41 m_target = target;
36 } 42 }
37 43
38 void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d) 44 void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d)
39 { 45 {
40 context3d->deleteQueryEXT(m_object); 46 context3d->deleteQueryEXT(m_object);
41 m_object = 0; 47 m_object = 0;
42 } 48 }
43 49
44 } // namespace blink 50 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLQuery.h ('k') | Source/modules/webgl/WebGLQuery.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698