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

Side by Side Diff: Source/core/html/canvas/WebGLContextObject.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
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 29 matching lines...) Expand all
40 WebGLContextObject::~WebGLContextObject() 40 WebGLContextObject::~WebGLContextObject()
41 { 41 {
42 if (m_context) 42 if (m_context)
43 m_context->removeContextObject(this); 43 m_context->removeContextObject(this);
44 } 44 }
45 45
46 void WebGLContextObject::detachContext() 46 void WebGLContextObject::detachContext()
47 { 47 {
48 detach(); 48 detach();
49 if (m_context) { 49 if (m_context) {
50 deleteObject(m_context->webGraphicsContext3D()); 50 deleteObject(m_context->webContext());
51 m_context->removeContextObject(this); 51 m_context->removeContextObject(this);
52 m_context = 0; 52 m_context = 0;
53 } 53 }
54 } 54 }
55 55
56 blink::WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() cons t 56 blink::WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() cons t
57 { 57 {
58 return m_context ? m_context->webGraphicsContext3D() : 0; 58 return m_context ? m_context->webContext() : 0;
59 } 59 }
60 60
61 } 61 }
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLContextGroup.cpp ('k') | Source/core/html/canvas/WebGLDebugShaders.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698