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

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

Issue 1151163002: Oilpan: eagerly finalize WebGLRenderingContext objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add explanatory comment Created 5 years, 6 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 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 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "core/html/canvas/WebGLContextObject.h" 28 #include "core/html/canvas/WebGLContextObject.h"
29 29
30 #include "core/html/canvas/WebGLRenderingContextBase.h" 30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31 #include "core/html/canvas/WebGLSharedWebGraphicsContext3D.h"
32 31
33 namespace blink { 32 namespace blink {
34 33
35 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) 34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context)
36 : WebGLObject(context) 35 : WebGLObject(context)
37 , m_context(context) 36 , m_context(context)
38 #if ENABLE(OILPAN)
39 , m_sharedWebGraphicsContext3D(context->sharedWebGraphicsContext3D())
40 #endif
41 { 37 {
42 } 38 }
43 39
44 WebGLContextObject::~WebGLContextObject() 40 WebGLContextObject::~WebGLContextObject()
45 { 41 {
46 #if !ENABLE(OILPAN) 42 #if !ENABLE(OILPAN)
47 if (m_context) 43 if (m_context)
48 m_context->removeContextObject(this); 44 m_context->removeContextObject(this);
49 #endif 45 #endif
50 } 46 }
51 47
52 void WebGLContextObject::detachContext() 48 void WebGLContextObject::detachContext()
53 { 49 {
54 detach(); 50 detach();
55 if (m_context) { 51 if (m_context) {
56 deleteObject(m_context->webContext()); 52 deleteObject(m_context->webContext());
57 m_context->removeContextObject(this); 53 m_context->removeContextObject(this);
58 m_context = nullptr; 54 m_context = nullptr;
59 #if ENABLE(OILPAN)
60 m_sharedWebGraphicsContext3D.clear();
61 #endif
62 } 55 }
63 } 56 }
64 57
65 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const 58 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const
66 { 59 {
67 #if ENABLE(OILPAN)
68 return m_sharedWebGraphicsContext3D ? m_sharedWebGraphicsContext3D->webConte xt() : 0;
69 #else
70 return m_context ? m_context->webContext() : 0; 60 return m_context ? m_context->webContext() : 0;
71 #endif
72 } 61 }
73 62
74 DEFINE_TRACE(WebGLContextObject) 63 DEFINE_TRACE(WebGLContextObject)
75 { 64 {
76 visitor->trace(m_context); 65 visitor->trace(m_context);
77 WebGLObject::trace(visitor); 66 WebGLObject::trace(visitor);
78 } 67 }
79 68
80 } // namespace blink 69 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLContextObject.h ('k') | Source/core/html/canvas/WebGLRenderingContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698