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 #include "ui/gfx/display.h" | 5 #include "ui/gfx/display.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 14 matching lines...) Expand all Loading... | |
25 double scale_in_double = 1.0; | 25 double scale_in_double = 1.0; |
26 if (HasForceDeviceScaleFactorImpl()) { | 26 if (HasForceDeviceScaleFactorImpl()) { |
27 std::string value = CommandLine::ForCurrentProcess()-> | 27 std::string value = CommandLine::ForCurrentProcess()-> |
28 GetSwitchValueASCII(switches::kForceDeviceScaleFactor); | 28 GetSwitchValueASCII(switches::kForceDeviceScaleFactor); |
29 if (!base::StringToDouble(value, &scale_in_double)) | 29 if (!base::StringToDouble(value, &scale_in_double)) |
30 LOG(ERROR) << "Failed to parse the default device scale factor:" << value; | 30 LOG(ERROR) << "Failed to parse the default device scale factor:" << value; |
31 } | 31 } |
32 return static_cast<float>(scale_in_double); | 32 return static_cast<float>(scale_in_double); |
33 } | 33 } |
34 | 34 |
35 } // namespace | 35 int64 internal_display_id_ = Display::kInvalidDisplayID; |
oshima
2013/02/14 21:01:33
Sorry for not catching this. This doesn't work (it
ynovikov
2013/02/15 17:42:42
Done.
(That's why I've split the anonymous namespa
| |
36 } // namespace | |
36 | 37 |
37 const int64 Display::kInvalidDisplayID = -1; | 38 const int64 Display::kInvalidDisplayID = -1; |
38 | 39 |
39 // static | 40 // static |
40 float Display::GetForcedDeviceScaleFactor() { | 41 float Display::GetForcedDeviceScaleFactor() { |
41 static const float kForcedDeviceScaleFactor = | 42 static const float kForcedDeviceScaleFactor = |
42 GetForcedDeviceScaleFactorImpl(); | 43 GetForcedDeviceScaleFactorImpl(); |
43 return kForcedDeviceScaleFactor; | 44 return kForcedDeviceScaleFactor; |
44 } | 45 } |
45 | 46 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
122 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) { | 123 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) { |
123 work_area_ = bounds_; | 124 work_area_ = bounds_; |
124 work_area_.Inset(insets); | 125 work_area_.Inset(insets); |
125 } | 126 } |
126 | 127 |
127 gfx::Size Display::GetSizeInPixel() const { | 128 gfx::Size Display::GetSizeInPixel() const { |
128 return gfx::ToFlooredSize(gfx::ScaleSize(size(), device_scale_factor_)); | 129 return gfx::ToFlooredSize(gfx::ScaleSize(size(), device_scale_factor_)); |
129 } | 130 } |
130 | 131 |
131 std::string Display::ToString() const { | 132 std::string Display::ToString() const { |
132 return base::StringPrintf("Display[%lld] bounds=%s, workarea=%s, scale=%f", | 133 return base::StringPrintf( |
133 static_cast<long long int>(id_), | 134 "Display[%lld] bounds=%s, workarea=%s, scale=%f, %s", |
134 bounds_.ToString().c_str(), | 135 static_cast<long long int>(id_), |
135 work_area_.ToString().c_str(), | 136 bounds_.ToString().c_str(), |
136 device_scale_factor_); | 137 work_area_.ToString().c_str(), |
138 device_scale_factor_, | |
139 IsInternal() ? "internal" : "external"); | |
140 } | |
141 | |
142 bool Display::IsInternal() const { | |
143 return is_valid() && (id_ == internal_display_id_); | |
144 } | |
145 | |
146 int64 Display::InternalDisplayId() { | |
147 return internal_display_id_; | |
148 } | |
149 | |
150 void Display::SetInternalDisplayId(int64 internal_display_id) { | |
151 internal_display_id_ = internal_display_id; | |
137 } | 152 } |
138 | 153 |
139 } // namespace gfx | 154 } // namespace gfx |
OLD | NEW |