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

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

Issue 24096029: Moved the majority of WebGL functionality into WebGLRenderingContextBase (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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) 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
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/WebGLContextGroup.h" 28 #include "core/html/canvas/WebGLContextGroup.h"
29 29
30 #include "core/html/canvas/WebGLRenderingContext.h" 30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31 #include "core/html/canvas/WebGLSharedObject.h" 31 #include "core/html/canvas/WebGLSharedObject.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 PassRefPtr<WebGLContextGroup> WebGLContextGroup::create() 35 PassRefPtr<WebGLContextGroup> WebGLContextGroup::create()
36 { 36 {
37 RefPtr<WebGLContextGroup> contextGroup = adoptRef(new WebGLContextGroup()); 37 RefPtr<WebGLContextGroup> contextGroup = adoptRef(new WebGLContextGroup());
38 return contextGroup.release(); 38 return contextGroup.release();
39 } 39 }
40 40
41 WebGLContextGroup::WebGLContextGroup() 41 WebGLContextGroup::WebGLContextGroup()
42 { 42 {
43 } 43 }
44 44
45 WebGLContextGroup::~WebGLContextGroup() 45 WebGLContextGroup::~WebGLContextGroup()
46 { 46 {
47 detachAndRemoveAllObjects(); 47 detachAndRemoveAllObjects();
48 } 48 }
49 49
50 GraphicsContext3D* WebGLContextGroup::getAGraphicsContext3D() 50 GraphicsContext3D* WebGLContextGroup::getAGraphicsContext3D()
51 { 51 {
52 ASSERT(!m_contexts.isEmpty()); 52 ASSERT(!m_contexts.isEmpty());
53 HashSet<WebGLRenderingContext*>::iterator it = m_contexts.begin(); 53 HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin();
54 return (*it)->graphicsContext3D(); 54 return (*it)->graphicsContext3D();
55 } 55 }
56 56
57 void WebGLContextGroup::addContext(WebGLRenderingContext* context) 57 void WebGLContextGroup::addContext(WebGLRenderingContextBase* context)
58 { 58 {
59 m_contexts.add(context); 59 m_contexts.add(context);
60 } 60 }
61 61
62 void WebGLContextGroup::removeContext(WebGLRenderingContext* context) 62 void WebGLContextGroup::removeContext(WebGLRenderingContextBase* context)
63 { 63 {
64 // We must call detachAndRemoveAllObjects before removing the last context. 64 // We must call detachAndRemoveAllObjects before removing the last context.
65 if (m_contexts.size() == 1 && m_contexts.contains(context)) 65 if (m_contexts.size() == 1 && m_contexts.contains(context))
66 detachAndRemoveAllObjects(); 66 detachAndRemoveAllObjects();
67 67
68 m_contexts.remove(context); 68 m_contexts.remove(context);
69 } 69 }
70 70
71 void WebGLContextGroup::removeObject(WebGLSharedObject* object) 71 void WebGLContextGroup::removeObject(WebGLSharedObject* object)
72 { 72 {
73 m_groupObjects.remove(object); 73 m_groupObjects.remove(object);
74 } 74 }
75 75
76 void WebGLContextGroup::addObject(WebGLSharedObject* object) 76 void WebGLContextGroup::addObject(WebGLSharedObject* object)
77 { 77 {
78 m_groupObjects.add(object); 78 m_groupObjects.add(object);
79 } 79 }
80 80
81 void WebGLContextGroup::detachAndRemoveAllObjects() 81 void WebGLContextGroup::detachAndRemoveAllObjects()
82 { 82 {
83 while (!m_groupObjects.isEmpty()) { 83 while (!m_groupObjects.isEmpty()) {
84 HashSet<WebGLSharedObject*>::iterator it = m_groupObjects.begin(); 84 HashSet<WebGLSharedObject*>::iterator it = m_groupObjects.begin();
85 (*it)->detachContextGroup(); 85 (*it)->detachContextGroup();
86 } 86 }
87 } 87 }
88 88
89 void WebGLContextGroup::loseContextGroup(WebGLRenderingContext::LostContextMode mode) 89 void WebGLContextGroup::loseContextGroup(WebGLRenderingContextBase::LostContextM ode mode)
90 { 90 {
91 // Detach must happen before loseContextImpl, which destroys the GraphicsCon text3D 91 // Detach must happen before loseContextImpl, which destroys the GraphicsCon text3D
92 // and prevents groupObjects from being properly deleted. 92 // and prevents groupObjects from being properly deleted.
93 detachAndRemoveAllObjects(); 93 detachAndRemoveAllObjects();
94 94
95 for (HashSet<WebGLRenderingContext*>::iterator it = m_contexts.begin(); it ! = m_contexts.end(); ++it) 95 for (HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin(); it != m_contexts.end(); ++it)
96 (*it)->loseContextImpl(mode); 96 (*it)->loseContextImpl(mode);
97 } 97 }
98 98
99 } // namespace WebCore 99 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698