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

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

Issue 1234883002: [Oilpan] Migrate classes under module/webgl onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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 PassRefPtrWillBeRawPtr<WebGLQuery> WebGLQuery::create(WebGL2RenderingContextBase * ctx) 13 WebGLQuery* WebGLQuery::create(WebGL2RenderingContextBase* ctx)
14 { 14 {
15 return adoptRefWillBeNoop(new WebGLQuery(ctx)); 15 return new WebGLQuery(ctx);
16 } 16 }
17 17
18 WebGLQuery::~WebGLQuery() 18 WebGLQuery::~WebGLQuery()
19 { 19 {
20 // Always call detach here to ensure that platform object deletion 20 // See the comment in WebGLObject::detachAndDeleteObject().
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.
27 detachAndDeleteObject(); 21 detachAndDeleteObject();
28 } 22 }
29 23
30 WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx) 24 WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx)
31 : WebGLSharedPlatform3DObject(ctx) 25 : WebGLSharedPlatform3DObject(ctx)
32 , m_target(0) 26 , m_target(0)
33 { 27 {
34 setObject(ctx->webContext()->createQueryEXT()); 28 setObject(ctx->webContext()->createQueryEXT());
35 } 29 }
36 30
37 void WebGLQuery::setTarget(GLenum target) 31 void WebGLQuery::setTarget(GLenum target)
38 { 32 {
39 ASSERT(object()); 33 ASSERT(object());
40 ASSERT(!m_target); 34 ASSERT(!m_target);
41 m_target = target; 35 m_target = target;
42 } 36 }
43 37
44 void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d) 38 void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d)
45 { 39 {
46 context3d->deleteQueryEXT(m_object); 40 context3d->deleteQueryEXT(m_object);
47 m_object = 0; 41 m_object = 0;
48 } 42 }
49 43
50 } // namespace blink 44 } // 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