| 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 #ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 5 #ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
| 6 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 6 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 RRMode selected_mode; | 116 RRMode selected_mode; |
| 117 | 117 |
| 118 // Output's origin on the framebuffer. | 118 // Output's origin on the framebuffer. |
| 119 int x; | 119 int x; |
| 120 int y; | 120 int y; |
| 121 | 121 |
| 122 // Output's physical dimensions. | 122 // Output's physical dimensions. |
| 123 uint64 width_mm; | 123 uint64 width_mm; |
| 124 uint64 height_mm; | 124 uint64 height_mm; |
| 125 | 125 |
| 126 // TODO(kcwu): Remove this. Check type == OUTPUT_TYPE_INTERNAL instead. | |
| 127 bool is_internal; | |
| 128 bool is_aspect_preserving_scaling; | 126 bool is_aspect_preserving_scaling; |
| 129 | 127 |
| 130 // The type of output. | 128 // The type of output. |
| 131 OutputType type; | 129 OutputType type; |
| 132 | 130 |
| 133 // Map from mode IDs to details about the corresponding modes. | 131 // Map from mode IDs to details about the corresponding modes. |
| 134 ModeInfoMap mode_infos; | 132 ModeInfoMap mode_infos; |
| 135 | 133 |
| 136 // XInput device ID or 0 if this output isn't a touchscreen. | 134 // XInput device ID or 0 if this output isn't a touchscreen. |
| 137 int touch_device_id; | 135 int touch_device_id; |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 ProtectionRequests client_protection_requests_; | 551 ProtectionRequests client_protection_requests_; |
| 554 | 552 |
| 555 DISALLOW_COPY_AND_ASSIGN(OutputConfigurator); | 553 DISALLOW_COPY_AND_ASSIGN(OutputConfigurator); |
| 556 }; | 554 }; |
| 557 | 555 |
| 558 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList; | 556 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList; |
| 559 | 557 |
| 560 } // namespace chromeos | 558 } // namespace chromeos |
| 561 | 559 |
| 562 #endif // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 560 #endif // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
| OLD | NEW |