Commit 279ee67c authored by mukai@chromium.org's avatar mukai@chromium.org

Re-introduce IsDisplayBlacklisted for internal display.

This was removed by r288412 but daisy chooses an incorrect
scale factor if missing.

BUG=402518
R=oshima@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/465783002

Cr-Commit-Position: refs/heads/master@{#288959}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288959 0039d316-1c4b-4281-b951-d872f2087c98
parent 1736b4ed
......@@ -192,9 +192,11 @@ void DisplayChangeObserver::OnDisplayModeChanged(
float device_scale_factor = 1.0f;
if (state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
device_scale_factor =
FindDeviceScaleFactor((kInchInMm * mode_info->size().width() /
state.display->physical_size().width()));
if (!ui::IsDisplaySizeBlackListed(state.display->physical_size())) {
device_scale_factor =
FindDeviceScaleFactor((kInchInMm * mode_info->size().width() /
state.display->physical_size().width()));
}
} else {
DisplayMode mode;
if (Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment