| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" | 5 #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 |
| 8 #if defined(TOOLKIT_USES_GTK) | 9 #if defined(TOOLKIT_USES_GTK) |
| 9 #include "base/message_pump_gtk.h" | 10 #include "base/message_loop/message_pump_gtk.h" |
| 10 #elif defined(USE_AURA) | 11 #elif defined(USE_AURA) |
| 11 #include "base/message_pump_aurax11.h" | 12 #include "base/message_loop/message_pump_aurax11.h" |
| 12 #endif | 13 #endif |
| 13 | 14 |
| 14 namespace content { | 15 namespace content { |
| 15 | 16 |
| 16 Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator( | 17 Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator( |
| 17 bool use_backing_pixmaps) | 18 bool use_backing_pixmaps) |
| 18 : use_backing_pixmaps_(use_backing_pixmaps) { | 19 : use_backing_pixmaps_(use_backing_pixmaps) { |
| 19 } | 20 } |
| 20 | 21 |
| 21 | 22 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 ImagePixmap::iterator it = eglimage_pixmap_.find(egl_image); | 82 ImagePixmap::iterator it = eglimage_pixmap_.find(egl_image); |
| 82 CHECK(it != eglimage_pixmap_.end()); | 83 CHECK(it != eglimage_pixmap_.end()); |
| 83 Pixmap pixmap = it->second; | 84 Pixmap pixmap = it->second; |
| 84 eglimage_pixmap_.erase(it); | 85 eglimage_pixmap_.erase(it); |
| 85 Display* x_display = base::MessagePumpForUI::GetDefaultXDisplay(); | 86 Display* x_display = base::MessagePumpForUI::GetDefaultXDisplay(); |
| 86 XFreePixmap(x_display, pixmap); | 87 XFreePixmap(x_display, pixmap); |
| 87 } | 88 } |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace content | 91 } // namespace content |
| OLD | NEW |