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

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

Issue 1151163002: Oilpan: eagerly finalize WebGLRenderingContext objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 30 matching lines...) Expand all
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(nullptr); 51 deleteObject(nullptr);
haraken 2015/05/26 11:23:10 This deleteObject retrieves a WebGraphicsContext3D
haraken 2015/05/26 12:50:12 BTW, doesn't this fact imply that the getAWebGraph
52 m_contextGroup->removeObject(this); 52 m_contextGroup->removeObject(this);
53 m_contextGroup = nullptr; 53 m_contextGroup = nullptr;
54 } 54 }
55 } 55 }
56 56
57 WebGraphicsContext3D* WebGLSharedObject::getAWebGraphicsContext3D() const 57 WebGraphicsContext3D* WebGLSharedObject::getAWebGraphicsContext3D() const
58 { 58 {
59 return m_contextGroup ? m_contextGroup->getAWebGraphicsContext3D() : nullptr ; 59 if (!m_contextGroup)
60 return nullptr;
61
62 #if ENABLE(OILPAN) && defined(ADDRESS_SANITIZER)
63 WebGLContextGroup::UnpoisonScope scope(m_contextGroup);
64 #endif
65 return m_contextGroup->getAWebGraphicsContext3D();
60 } 66 }
61 67
62 } // namespace blink 68 } // namespace blink
OLDNEW
« Source/core/html/canvas/WebGLContextGroup.cpp ('K') | « Source/core/html/canvas/WebGLObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698