OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/display/chromeos/x11/display_snapshot_x11.h" | 5 #include "ui/display/chromeos/x11/display_snapshot_x11.h" |
6 | 6 |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "ui/display/chromeos/x11/display_mode_x11.h" | 8 #include "ui/display/chromeos/x11/display_mode_x11.h" |
9 | 9 |
10 namespace ui { | 10 namespace ui { |
11 | 11 |
12 DisplaySnapshotX11::DisplaySnapshotX11( | 12 DisplaySnapshotX11::DisplaySnapshotX11( |
13 int64_t display_id, | 13 int64_t display_id, |
14 const gfx::Point& origin, | 14 const gfx::Point& origin, |
15 const gfx::Size& physical_size, | 15 const gfx::Size& physical_size, |
16 DisplayConnectionType type, | 16 DisplayConnectionType type, |
17 bool is_aspect_preserving_scaling, | 17 bool is_aspect_preserving_scaling, |
18 bool has_overscan, | 18 bool has_overscan, |
19 std::string display_name, | 19 std::string display_name, |
20 const std::vector<const DisplayMode*>& modes, | 20 const std::vector<const DisplayMode*>& modes, |
| 21 const std::vector<uint8_t>& edid, |
21 const DisplayMode* current_mode, | 22 const DisplayMode* current_mode, |
22 const DisplayMode* native_mode, | 23 const DisplayMode* native_mode, |
23 RROutput output, | 24 RROutput output, |
24 RRCrtc crtc, | 25 RRCrtc crtc, |
25 int index) | 26 int index) |
26 : DisplaySnapshot(display_id, | 27 : DisplaySnapshot(display_id, |
27 origin, | 28 origin, |
28 physical_size, | 29 physical_size, |
29 type, | 30 type, |
30 is_aspect_preserving_scaling, | 31 is_aspect_preserving_scaling, |
31 has_overscan, | 32 has_overscan, |
32 display_name, | 33 display_name, |
33 // TODO(jdufault): Figure out if we can get the file | 34 // TODO(jdufault): Figure out if we can get the file |
34 // descriptor that maps to the device. | 35 // descriptor that maps to the device. |
35 base::FilePath(), | 36 base::FilePath(), |
36 modes, | 37 modes, |
| 38 edid, |
37 current_mode, | 39 current_mode, |
38 native_mode), | 40 native_mode), |
39 output_(output), | 41 output_(output), |
40 crtc_(crtc), | 42 crtc_(crtc), |
41 index_(index) {} | 43 index_(index) {} |
42 | 44 |
43 DisplaySnapshotX11::~DisplaySnapshotX11() {} | 45 DisplaySnapshotX11::~DisplaySnapshotX11() {} |
44 | 46 |
45 std::string DisplaySnapshotX11::ToString() const { | 47 std::string DisplaySnapshotX11::ToString() const { |
46 return base::StringPrintf( | 48 return base::StringPrintf( |
47 "[type=%d, output=%ld, crtc=%ld, mode=%ld, dim=%dx%d]", | 49 "[type=%d, output=%ld, crtc=%ld, mode=%ld, dim=%dx%d]", |
48 type_, | 50 type_, |
49 output_, | 51 output_, |
50 crtc_, | 52 crtc_, |
51 current_mode_ | 53 current_mode_ |
52 ? static_cast<const DisplayModeX11*>(current_mode_)->mode_id() | 54 ? static_cast<const DisplayModeX11*>(current_mode_)->mode_id() |
53 : 0, | 55 : 0, |
54 physical_size_.width(), | 56 physical_size_.width(), |
55 physical_size_.height()); | 57 physical_size_.height()); |
56 } | 58 } |
57 | 59 |
58 } // namespace ui | 60 } // namespace ui |
OLD | NEW |