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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLContextObject.cpp

Issue 1363243003: Manage WebGLRenderingContextBase's weak refs manually without Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinstate WebGLContextObject dtor (non-Oilpan) Created 5 years, 2 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 | « no previous file | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h » ('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 21 matching lines...) Expand all
32 namespace blink { 32 namespace blink {
33 33
34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) 34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context)
35 : WebGLObject(context) 35 : WebGLObject(context)
36 , m_context(context) 36 , m_context(context)
37 { 37 {
38 } 38 }
39 39
40 WebGLContextObject::~WebGLContextObject() 40 WebGLContextObject::~WebGLContextObject()
41 { 41 {
42 #if !ENABLE(OILPAN)
43 if (m_context)
44 m_context->removeContextObject(this);
45 #endif
42 } 46 }
43 47
44 void WebGLContextObject::detachContext() 48 void WebGLContextObject::detachContext()
45 { 49 {
46 detach(); 50 detach();
47 if (m_context) { 51 if (m_context) {
48 deleteObject(m_context->webContext()); 52 deleteObject(m_context->webContext());
49 m_context->removeContextObject(this); 53 m_context->removeContextObject(this);
50 m_context = nullptr; 54 m_context = nullptr;
51 } 55 }
52 } 56 }
53 57
54 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const 58 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const
55 { 59 {
56 return m_context ? m_context->webContext() : nullptr; 60 return m_context ? m_context->webContext() : nullptr;
57 } 61 }
58 62
59 DEFINE_TRACE(WebGLContextObject) 63 DEFINE_TRACE(WebGLContextObject)
60 { 64 {
61 visitor->trace(m_context); 65 visitor->trace(m_context);
62 WebGLObject::trace(visitor); 66 WebGLObject::trace(visitor);
63 } 67 }
64 68
65 } // namespace blink 69 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698