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

Side by Side Diff: Source/core/html/canvas/WebGLShader.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/WebGLShader.h" 28 #include "core/html/canvas/WebGLShader.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<WebGLShader> WebGLShader::create(WebGLRenderingContextBase* ctx, GLen um type) 34 PassRefPtrWillBeRawPtr<WebGLShader> WebGLShader::create(WebGLRenderingContextBas e* ctx, GLenum type)
35 { 35 {
36 return adoptRef(new WebGLShader(ctx, type)); 36 return adoptRefWillBeNoop(new WebGLShader(ctx, type));
37 } 37 }
38 38
39 WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GLenum type) 39 WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GLenum type)
40 : WebGLSharedObject(ctx) 40 : WebGLSharedObject(ctx)
41 , m_type(type) 41 , m_type(type)
42 , m_source("") 42 , m_source("")
43 { 43 {
44 ScriptWrappable::init(this); 44 ScriptWrappable::init(this);
45 setObject(ctx->webContext()->createShader(type)); 45 setObject(ctx->webContext()->createShader(type));
46 } 46 }
47 47
48 WebGLShader::~WebGLShader() 48 WebGLShader::~WebGLShader()
49 { 49 {
50 deleteObject(0); 50 // Always call detach here to ensure that platform object deletion
51 // happens with Oilpan enabled. It keeps the code regular to do it
52 // with or without Oilpan enabled.
53 //
54 // See comment in WebGLBuffer's destructor for additional
55 // information on why this is done for WebGLSharedObject-derived
56 // objects.
57 detachAndDeleteObject();
51 } 58 }
52 59
53 void WebGLShader::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object) 60 void WebGLShader::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object)
54 { 61 {
55 context3d->deleteShader(object); 62 context3d->deleteShader(object);
56 } 63 }
57 64
58 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698