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

Side by Side Diff: Source/core/html/canvas/WebGLObject.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: Make WebGLObjects keep a blink::WebGraphicsContext3D for finalization. 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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/WebGLObject.h" 28 #include "core/html/canvas/WebGLObject.h"
29 29
30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31
30 namespace WebCore { 32 namespace WebCore {
31 33
32 WebGLObject::WebGLObject(WebGLRenderingContextBase*) 34 WebGLObject::WebGLObject(WebGLRenderingContextBase* base)
33 : m_object(0) 35 : m_object(0)
36 #if ENABLE(OILPAN)
37 , m_context3d(base->webContext())
haraken 2014/07/11 01:55:02 I basically like the idea of caching the webContex
sof 2014/07/11 06:51:35 It's a very good question. All remaining WebGLSha
haraken 2014/07/11 07:01:33 Or probably can we create Context3DObserver or som
Mads Ager (chromium) 2014/07/11 09:15:01 We should attempt to avoid that. We are attempting
sof 2014/07/11 09:42:02 That would be a tidy way to handle registration an
Mads Ager (chromium) 2014/07/11 10:18:52 I guess we could use PersistentHeapHashSet<Member<
38 #endif
34 , m_attachmentCount(0) 39 , m_attachmentCount(0)
35 , m_deleted(false) 40 , m_deleted(false)
36 { 41 {
37 } 42 }
38 43
39 WebGLObject::~WebGLObject() 44 WebGLObject::~WebGLObject()
40 { 45 {
46 #if ENABLE(OILPAN)
47 // Verify that derived classes have released their platform objects.
48 ASSERT(m_deleted);
49 #endif
41 } 50 }
42 51
43 void WebGLObject::setObject(Platform3DObject object) 52 void WebGLObject::setObject(Platform3DObject object)
44 { 53 {
45 // object==0 && m_deleted==false indicating an uninitialized state; 54 // object==0 && m_deleted==false indicating an uninitialized state;
46 ASSERT(!m_object && !m_deleted); 55 ASSERT(!m_object && !m_deleted);
47 m_object = object; 56 m_object = object;
48 } 57 }
49 58
50 void WebGLObject::deleteObject(blink::WebGraphicsContext3D* context3d) 59 void WebGLObject::deleteObject(blink::WebGraphicsContext3D* context3d)
51 { 60 {
52 m_deleted = true; 61 m_deleted = true;
53 if (!m_object) 62 if (!m_object)
54 return; 63 return;
55 64
56 if (!hasGroupOrContext()) 65 if (!hasGroupOrContext())
57 return; 66 return;
58 67
59 if (!m_attachmentCount) { 68 if (!m_attachmentCount) {
60 if (!context3d) 69 if (!context3d) {
70 #if ENABLE(OILPAN)
71 context3d = m_context3d;
72 #else
61 context3d = getAWebGraphicsContext3D(); 73 context3d = getAWebGraphicsContext3D();
74 #endif
75 }
62 76
63 if (context3d) 77 if (context3d)
64 deleteObjectImpl(context3d, m_object); 78 deleteObjectImpl(context3d, m_object);
65 79
66 m_object = 0; 80 m_object = 0;
67 } 81 }
68 } 82 }
69 83
70 void WebGLObject::detach() 84 void WebGLObject::detach()
71 { 85 {
72 m_attachmentCount = 0; // Make sure OpenGL resource is deleted. 86 m_attachmentCount = 0; // Make sure OpenGL resource is deleted.
73 } 87 }
74
75 88
76 void WebGLObject::onDetached(blink::WebGraphicsContext3D* context3d) 89 void WebGLObject::onDetached(blink::WebGraphicsContext3D* context3d)
77 { 90 {
78 if (m_attachmentCount) 91 if (m_attachmentCount)
79 --m_attachmentCount; 92 --m_attachmentCount;
80 if (m_deleted) 93 if (m_deleted)
81 deleteObject(context3d); 94 deleteObject(context3d);
82 } 95 }
83 96
84 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698