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

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

Issue 24096029: Moved the majority of WebGL functionality into WebGLRenderingContextBase (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed typo in gypi, was only causing issues on Windows (?!?) Created 6 years, 10 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
(...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/WebGLSharedObject.h" 28 #include "core/html/canvas/WebGLSharedObject.h"
29 29
30 #include "core/html/canvas/WebGLContextGroup.h" 30 #include "core/html/canvas/WebGLContextGroup.h"
31 #include "core/html/canvas/WebGLRenderingContext.h" 31 #include "core/html/canvas/WebGLRenderingContextBase.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 WebGLSharedObject::WebGLSharedObject(WebGLRenderingContext* context) 35 WebGLSharedObject::WebGLSharedObject(WebGLRenderingContextBase* context)
36 : WebGLObject(context), 36 : WebGLObject(context),
37 m_contextGroup(context->contextGroup()) 37 m_contextGroup(context->contextGroup())
38 { 38 {
39 } 39 }
40 40
41 WebGLSharedObject::~WebGLSharedObject() 41 WebGLSharedObject::~WebGLSharedObject()
42 { 42 {
43 if (m_contextGroup) 43 if (m_contextGroup)
44 m_contextGroup->removeObject(this); 44 m_contextGroup->removeObject(this);
45 } 45 }
46 46
47 void WebGLSharedObject::detachContextGroup() 47 void WebGLSharedObject::detachContextGroup()
48 { 48 {
49 detach(); 49 detach();
50 if (m_contextGroup) { 50 if (m_contextGroup) {
51 deleteObject(0); 51 deleteObject(0);
52 m_contextGroup->removeObject(this); 52 m_contextGroup->removeObject(this);
53 m_contextGroup = 0; 53 m_contextGroup = 0;
54 } 54 }
55 } 55 }
56 56
57 blink::WebGraphicsContext3D* WebGLSharedObject::getAWebGraphicsContext3D() const 57 blink::WebGraphicsContext3D* WebGLSharedObject::getAWebGraphicsContext3D() const
58 { 58 {
59 return m_contextGroup ? m_contextGroup->getAWebGraphicsContext3D() : 0; 59 return m_contextGroup ? m_contextGroup->getAWebGraphicsContext3D() : 0;
60 } 60 }
61 61
62 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698