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

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

Issue 223223003: Re-land "WebGL: Transfer ownership of WebGraphicsContext3D to DrawingBuffer" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix errata on comment Created 6 years, 8 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
« no previous file with comments | « Source/core/html/canvas/WebGLBuffer.cpp ('k') | Source/core/html/canvas/WebGLContextObject.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 WebGLContextGroup::~WebGLContextGroup() 44 WebGLContextGroup::~WebGLContextGroup()
45 { 45 {
46 detachAndRemoveAllObjects(); 46 detachAndRemoveAllObjects();
47 } 47 }
48 48
49 blink::WebGraphicsContext3D* WebGLContextGroup::getAWebGraphicsContext3D() 49 blink::WebGraphicsContext3D* WebGLContextGroup::getAWebGraphicsContext3D()
50 { 50 {
51 ASSERT(!m_contexts.isEmpty()); 51 ASSERT(!m_contexts.isEmpty());
52 HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin(); 52 HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin();
53 return (*it)->webGraphicsContext3D(); 53 return (*it)->webContext();
54 } 54 }
55 55
56 void WebGLContextGroup::addContext(WebGLRenderingContextBase* context) 56 void WebGLContextGroup::addContext(WebGLRenderingContextBase* context)
57 { 57 {
58 m_contexts.add(context); 58 m_contexts.add(context);
59 } 59 }
60 60
61 void WebGLContextGroup::removeContext(WebGLRenderingContextBase* context) 61 void WebGLContextGroup::removeContext(WebGLRenderingContextBase* context)
62 { 62 {
63 // We must call detachAndRemoveAllObjects before removing the last context. 63 // We must call detachAndRemoveAllObjects before removing the last context.
(...skipping 25 matching lines...) Expand all
89 { 89 {
90 // Detach must happen before loseContextImpl, which destroys the GraphicsCon text3D 90 // Detach must happen before loseContextImpl, which destroys the GraphicsCon text3D
91 // and prevents groupObjects from being properly deleted. 91 // and prevents groupObjects from being properly deleted.
92 detachAndRemoveAllObjects(); 92 detachAndRemoveAllObjects();
93 93
94 for (HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin(); it != m_contexts.end(); ++it) 94 for (HashSet<WebGLRenderingContextBase*>::iterator it = m_contexts.begin(); it != m_contexts.end(); ++it)
95 (*it)->loseContextImpl(mode); 95 (*it)->loseContextImpl(mode);
96 } 96 }
97 97
98 } // namespace WebCore 98 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLBuffer.cpp ('k') | Source/core/html/canvas/WebGLContextObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698