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

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

Issue 1508673002: Oilpan: remove unnecessary MultisamplingChangedObserver unregistration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: only provide removeMultisamplingChangedObserver non-Oilpan Created 5 years 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 | « third_party/WebKit/Source/core/page/Page.cpp ('k') | no next file » | 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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 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 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 tracker->loseExtension(true); 1182 tracker->loseExtension(true);
1183 } 1183 }
1184 m_extensions.clear(); 1184 m_extensions.clear();
1185 1185
1186 // Context must be removed from the group prior to the destruction of the 1186 // Context must be removed from the group prior to the destruction of the
1187 // WebGraphicsContext3D, otherwise shared objects may not be properly delete d. 1187 // WebGraphicsContext3D, otherwise shared objects may not be properly delete d.
1188 m_contextGroup->removeContext(this); 1188 m_contextGroup->removeContext(this);
1189 1189
1190 destroyContext(); 1190 destroyContext();
1191 1191
1192 #if !ENABLE(OILPAN)
1192 if (m_multisamplingObserverRegistered) { 1193 if (m_multisamplingObserverRegistered) {
1193 if (Page* page = canvas()->document().page()) 1194 if (Page* page = canvas()->document().page())
1194 page->removeMultisamplingChangedObserver(this); 1195 page->removeMultisamplingChangedObserver(this);
1195 } 1196 }
1197 #endif
1196 1198
1197 willDestroyContext(this); 1199 willDestroyContext(this);
1198 } 1200 }
1199 1201
1200 void WebGLRenderingContextBase::destroyContext() 1202 void WebGLRenderingContextBase::destroyContext()
1201 { 1203 {
1202 if (!drawingBuffer()) 1204 if (!drawingBuffer())
1203 return; 1205 return;
1204 1206
1205 m_extensionsUtil.clear(); 1207 m_extensionsUtil.clear();
(...skipping 5815 matching lines...) Expand 10 before | Expand all | Expand 10 after
7021 webContext()->pixelStorei(GL_UNPACK_ALIGNMENT, 1); 7023 webContext()->pixelStorei(GL_UNPACK_ALIGNMENT, 1);
7022 } 7024 }
7023 7025
7024 void WebGLRenderingContextBase::restoreUnpackParameters() 7026 void WebGLRenderingContextBase::restoreUnpackParameters()
7025 { 7027 {
7026 if (m_unpackAlignment != 1) 7028 if (m_unpackAlignment != 1)
7027 webContext()->pixelStorei(GL_UNPACK_ALIGNMENT, m_unpackAlignment); 7029 webContext()->pixelStorei(GL_UNPACK_ALIGNMENT, m_unpackAlignment);
7028 } 7030 }
7029 7031
7030 } // namespace blink 7032 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698