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

Side by Side Diff: Source/core/html/canvas/WebGLShader.cpp

Issue 540283003: bindings: Retires ScriptWrappable::init, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed a review comment. Created 6 years, 3 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 | Annotate | Revision Log
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 23 matching lines...) Expand all
34 PassRefPtrWillBeRawPtr<WebGLShader> WebGLShader::create(WebGLRenderingContextBas e* ctx, GLenum type) 34 PassRefPtrWillBeRawPtr<WebGLShader> WebGLShader::create(WebGLRenderingContextBas e* ctx, GLenum type)
35 { 35 {
36 return adoptRefWillBeNoop(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);
45 setObject(ctx->webContext()->createShader(type)); 44 setObject(ctx->webContext()->createShader(type));
46 } 45 }
47 46
48 WebGLShader::~WebGLShader() 47 WebGLShader::~WebGLShader()
49 { 48 {
50 // Always call detach here to ensure that platform object deletion 49 // Always call detach here to ensure that platform object deletion
51 // happens with Oilpan enabled. It keeps the code regular to do it 50 // happens with Oilpan enabled. It keeps the code regular to do it
52 // with or without Oilpan enabled. 51 // with or without Oilpan enabled.
53 // 52 //
54 // See comment in WebGLBuffer's destructor for additional 53 // See comment in WebGLBuffer's destructor for additional
55 // information on why this is done for WebGLSharedObject-derived 54 // information on why this is done for WebGLSharedObject-derived
56 // objects. 55 // objects.
57 detachAndDeleteObject(); 56 detachAndDeleteObject();
58 } 57 }
59 58
60 void WebGLShader::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object) 59 void WebGLShader::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object)
61 { 60 {
62 context3d->deleteShader(object); 61 context3d->deleteShader(object);
63 } 62 }
64 63
65 } 64 }
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLRenderingContext.cpp ('k') | Source/core/html/canvas/WebGLShaderPrecisionFormat.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698