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

Side by Side Diff: trunk/src/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
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
9 #if defined(TOOLKIT_USES_GTK) 8 #if defined(TOOLKIT_USES_GTK)
10 #include "base/message_loop/message_pump_gtk.h" 9 #include "base/message_pump_gtk.h"
11 #elif defined(USE_AURA) 10 #elif defined(USE_AURA)
12 #include "base/message_loop/message_pump_aurax11.h" 11 #include "base/message_pump_aurax11.h"
13 #endif 12 #endif
14 13
15 namespace content { 14 namespace content {
16 15
17 Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator( 16 Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator(
18 bool use_backing_pixmaps) 17 bool use_backing_pixmaps)
19 : use_backing_pixmaps_(use_backing_pixmaps) { 18 : use_backing_pixmaps_(use_backing_pixmaps) {
20 } 19 }
21 20
22 21
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 ImagePixmap::iterator it = eglimage_pixmap_.find(egl_image); 81 ImagePixmap::iterator it = eglimage_pixmap_.find(egl_image);
83 CHECK(it != eglimage_pixmap_.end()); 82 CHECK(it != eglimage_pixmap_.end());
84 Pixmap pixmap = it->second; 83 Pixmap pixmap = it->second;
85 eglimage_pixmap_.erase(it); 84 eglimage_pixmap_.erase(it);
86 Display* x_display = base::MessagePumpForUI::GetDefaultXDisplay(); 85 Display* x_display = base::MessagePumpForUI::GetDefaultXDisplay();
87 XFreePixmap(x_display, pixmap); 86 XFreePixmap(x_display, pixmap);
88 } 87 }
89 } 88 }
90 89
91 } // namespace content 90 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/browser/web_contents/web_contents_view_mac.mm ('k') | trunk/src/content/shell/shell_application_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698