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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

Issue 1278523005: Ozone: Keep the native pixmap alive till gl_image is destroyed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove un-needed changes Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index 30518b9207a88d8f4348eff5076dbd8ac03f9d00..ff8bd017122c340c7c75772e39a445dcd3a7c36e 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -75,7 +75,6 @@ GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const Size& size,
: GLImageEGL(size), internalformat_(internalformat) {}
GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {
- DCHECK(!pixmap_);
}
bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
@@ -128,7 +127,6 @@ unsigned GLImageOzoneNativePixmap::GetInternalFormat() {
void GLImageOzoneNativePixmap::Destroy(bool have_context) {
GLImageEGL::Destroy(have_context);
- pixmap_ = nullptr;
}
bool GLImageOzoneNativePixmap::ScheduleOverlayPlane(AcceleratedWidget widget,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698