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

Side by Side Diff: Source/modules/webgl/WebGLRenderbuffer.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/WebGLRenderbuffer.h ('k') | Source/modules/webgl/WebGLRenderbuffer.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/WebGLRenderbuffer.h" 28 #include "modules/webgl/WebGLRenderbuffer.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 WebGLRenderbuffer* WebGLRenderbuffer::create(WebGLRenderingContextBase* ctx) 34 PassRefPtrWillBeRawPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderi ngContextBase* ctx)
35 { 35 {
36 return new WebGLRenderbuffer(ctx); 36 return adoptRefWillBeNoop(new WebGLRenderbuffer(ctx));
37 } 37 }
38 38
39 WebGLRenderbuffer::~WebGLRenderbuffer() 39 WebGLRenderbuffer::~WebGLRenderbuffer()
40 { 40 {
41 #if ENABLE(OILPAN)
41 // This render buffer (heap) object must finalize itself. 42 // This render buffer (heap) object must finalize itself.
42 m_emulatedStencilBuffer.clear(); 43 m_emulatedStencilBuffer.clear();
43 44 #endif
44 // See the comment in WebGLObject::detachAndDeleteObject(). 45 // Always call detach here to ensure that platform object deletion
46 // happens with Oilpan enabled. It keeps the code regular to do it
47 // with or without Oilpan enabled.
48 //
49 // See comment in WebGLBuffer's destructor for additional
50 // information on why this is done for WebGLSharedObject-derived
51 // objects.
45 detachAndDeleteObject(); 52 detachAndDeleteObject();
46 } 53 }
47 54
48 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) 55 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx)
49 : WebGLSharedPlatform3DObject(ctx) 56 : WebGLSharedPlatform3DObject(ctx)
50 , m_internalFormat(GL_RGBA4) 57 , m_internalFormat(GL_RGBA4)
51 , m_width(0) 58 , m_width(0)
52 , m_height(0) 59 , m_height(0)
53 , m_hasEverBeenBound(false) 60 , m_hasEverBeenBound(false)
54 { 61 {
(...skipping 15 matching lines...) Expand all
70 m_emulatedStencilBuffer.clear(); 77 m_emulatedStencilBuffer.clear();
71 } 78 }
72 79
73 DEFINE_TRACE(WebGLRenderbuffer) 80 DEFINE_TRACE(WebGLRenderbuffer)
74 { 81 {
75 visitor->trace(m_emulatedStencilBuffer); 82 visitor->trace(m_emulatedStencilBuffer);
76 WebGLSharedPlatform3DObject::trace(visitor); 83 WebGLSharedPlatform3DObject::trace(visitor);
77 } 84 }
78 85
79 } // namespace blink 86 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLRenderbuffer.h ('k') | Source/modules/webgl/WebGLRenderbuffer.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698