OLD | NEW |
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 Loading... |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "modules/webgl/WebGLShader.h" | 28 #include "modules/webgl/WebGLShader.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 PassRefPtrWillBeRawPtr<WebGLShader> WebGLShader::create(WebGLRenderingContextBas
e* ctx, GLenum type) | 34 WebGLShader* WebGLShader::create(WebGLRenderingContextBase* ctx, GLenum type) |
35 { | 35 { |
36 return adoptRefWillBeNoop(new WebGLShader(ctx, type)); | 36 return new WebGLShader(ctx, type); |
37 } | 37 } |
38 | 38 |
39 WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GLenum type) | 39 WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GLenum type) |
40 : WebGLSharedPlatform3DObject(ctx) | 40 : WebGLSharedPlatform3DObject(ctx) |
41 , m_type(type) | 41 , m_type(type) |
42 , m_source("") | 42 , m_source("") |
43 { | 43 { |
44 setObject(ctx->webContext()->createShader(type)); | 44 setObject(ctx->webContext()->createShader(type)); |
45 } | 45 } |
46 | 46 |
47 WebGLShader::~WebGLShader() | 47 WebGLShader::~WebGLShader() |
48 { | 48 { |
49 // Always call detach here to ensure that platform object deletion | 49 // Call detach here to ensure that platform object deletion happens. |
50 // happens with Oilpan enabled. It keeps the code regular to do it | |
51 // with or without Oilpan enabled. | |
52 // | 50 // |
53 // See comment in WebGLBuffer's destructor for additional | 51 // See comment in WebGLBuffer's destructor for additional |
54 // information on why this is done for WebGLSharedObject-derived | 52 // information on why this is done for WebGLSharedObject-derived |
55 // objects. | 53 // objects. |
56 detachAndDeleteObject(); | 54 detachAndDeleteObject(); |
57 } | 55 } |
58 | 56 |
59 void WebGLShader::deleteObjectImpl(WebGraphicsContext3D* context3d) | 57 void WebGLShader::deleteObjectImpl(WebGraphicsContext3D* context3d) |
60 { | 58 { |
61 context3d->deleteShader(m_object); | 59 context3d->deleteShader(m_object); |
62 m_object = 0; | 60 m_object = 0; |
63 } | 61 } |
64 | 62 |
65 } // namespace blink | 63 } // namespace blink |
OLD | NEW |