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

Side by Side Diff: ui/gfx/x/x11_atom_cache.cc

Issue 392153002: Remove X11/Xlib.h include from selection_requestor.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « ui/gfx/x/x11_atom_cache.h ('k') | ui/gfx/x/x11_types.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 // 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 "ui/gfx/x/x11_atom_cache.h" 5 #include "ui/gfx/x/x11_atom_cache.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char** to_cache) 15 X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char** to_cache)
16 : xdisplay_(xdisplay), 16 : xdisplay_(xdisplay),
17 uncached_atoms_allowed_(false) { 17 uncached_atoms_allowed_(false) {
18 int cache_count = 0; 18 int cache_count = 0;
19 for (const char** i = to_cache; *i != NULL; i++) 19 for (const char** i = to_cache; *i != NULL; i++)
20 cache_count++; 20 cache_count++;
21 21
22 scoped_ptr<Atom[]> cached_atoms(new Atom[cache_count]); 22 scoped_ptr<XAtom[]> cached_atoms(new XAtom[cache_count]);
23 23
24 // Grab all the atoms we need now to minimize roundtrips to the X11 server. 24 // Grab all the atoms we need now to minimize roundtrips to the X11 server.
25 XInternAtoms(xdisplay_, 25 XInternAtoms(xdisplay_,
26 const_cast<char**>(to_cache), cache_count, False, 26 const_cast<char**>(to_cache), cache_count, False,
27 cached_atoms.get()); 27 cached_atoms.get());
28 28
29 for (int i = 0; i < cache_count; ++i) 29 for (int i = 0; i < cache_count; ++i)
30 cached_atoms_.insert(std::make_pair(to_cache[i], cached_atoms[i])); 30 cached_atoms_.insert(std::make_pair(to_cache[i], cached_atoms[i]));
31 } 31 }
32 32
33 X11AtomCache::~X11AtomCache() {} 33 X11AtomCache::~X11AtomCache() {}
34 34
35 Atom X11AtomCache::GetAtom(const char* name) const { 35 XAtom X11AtomCache::GetAtom(const char* name) const {
36 std::map<std::string, Atom>::const_iterator it = cached_atoms_.find(name); 36 std::map<std::string, Atom>::const_iterator it = cached_atoms_.find(name);
37 37
38 if (uncached_atoms_allowed_ && it == cached_atoms_.end()) { 38 if (uncached_atoms_allowed_ && it == cached_atoms_.end()) {
39 Atom atom = XInternAtom(xdisplay_, name, false); 39 XAtom atom = XInternAtom(xdisplay_, name, false);
40 cached_atoms_.insert(std::make_pair(name, atom)); 40 cached_atoms_.insert(std::make_pair(name, atom));
41 return atom; 41 return atom;
42 } 42 }
43 43
44 CHECK(it != cached_atoms_.end()) << " Atom " << name << " not found"; 44 CHECK(it != cached_atoms_.end()) << " Atom " << name << " not found";
45 return it->second; 45 return it->second;
46 } 46 }
47 47
48 } // namespace ui 48 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gfx/x/x11_atom_cache.h ('k') | ui/gfx/x/x11_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698