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

Side by Side Diff: ui/gfx/color_space_x11.cc

Issue 2140803002: Color: Don't duplicate ICC profile data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux Created 4 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
« ui/gfx/color_space.cc ('K') | « ui/gfx/color_space_win.cc ('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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <stddef.h> 5 #include <stddef.h>
6 6
7 extern "C" { 7 extern "C" {
8 #include <X11/Xatom.h> 8 #include <X11/Xatom.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 } 10 }
11 11
12 #include "ui/gfx/color_space.h" 12 #include "ui/gfx/color_space.h"
13 13
14 #include "ui/gfx/x/x11_types.h" 14 #include "ui/gfx/x/x11_types.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 17
18 // static 18 // static
19 ColorSpace ColorSpace::FromBestMonitor() { 19 ColorSpace ColorSpace::FromBestMonitor() {
20 ColorSpace color_space;
21 Atom property = XInternAtom(GetXDisplay(), "_ICC_PROFILE", true); 20 Atom property = XInternAtom(GetXDisplay(), "_ICC_PROFILE", true);
22 if (property != None) { 21 if (property != None) {
23 Atom prop_type = None; 22 Atom prop_type = None;
24 int prop_format = 0; 23 int prop_format = 0;
25 unsigned long nitems = 0; 24 unsigned long nitems = 0;
26 unsigned long nbytes = 0; 25 unsigned long nbytes = 0;
27 char* property_data = NULL; 26 char* property_data = NULL;
28 if (XGetWindowProperty( 27 if (XGetWindowProperty(
29 GetXDisplay(), DefaultRootWindow(GetXDisplay()), property, 0, 28 GetXDisplay(), DefaultRootWindow(GetXDisplay()), property, 0,
30 0x1FFFFFFF /* MAXINT32 / 4 */, False, AnyPropertyType, &prop_type, 29 0x1FFFFFFF /* MAXINT32 / 4 */, False, AnyPropertyType, &prop_type,
31 &prop_format, &nitems, &nbytes, 30 &prop_format, &nitems, &nbytes,
32 reinterpret_cast<unsigned char**>(&property_data)) == Success) { 31 reinterpret_cast<unsigned char**>(&property_data)) == Success) {
33 color_space.icc_profile_.assign(property_data, property_data + nitems); 32 std::vector<char> icc_profile;
33 icc_profile.assign(property_data, property_data + nitems);
34 XFree(property_data); 34 XFree(property_data);
35 return FromICCProfile(icc_profile);
35 } 36 }
36 } 37 }
37 return color_space; 38 return ColorSpace();
38 } 39 }
39 40
40 } // namespace gfx 41 } // namespace gfx
OLDNEW
« ui/gfx/color_space.cc ('K') | « ui/gfx/color_space_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698