mustash: Fix scale factor for bad physical_size.

services/ui/display/platform_screen_ozone.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/display/platform_screen_ozone.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 namespace display {
 namespace {
 
 // Needed for DisplayConfigurator::ForceInitialConfigure.
 const SkColor kChromeOsBootColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
 
 const float kInchInMm = 25.4f;
 
 float ComputeDisplayDPI(const gfx::Size& pixel_size,
                         const gfx::Size& physical_size) {
-  DCHECK(!physical_size.IsEmpty());
+  // The physical_size is broken for some devices, return standard DPI. See
+  // crbug.com/669554.
+  if (physical_size.IsEmpty()) {
+    LOG(ERROR) << "Display has empty phsical_size";
+    return 96.0f;
+  }
+
   return (pixel_size.width() / static_cast<float>(physical_size.width())) *
          kInchInMm;
 }
 
 // Finds the device scale factor based on the display DPI. Will use forced
 // device scale factor if provided via command line.
 float FindDeviceScaleFactor(float dpi) {
   if (Display::HasForceDeviceScaleFactor())
     return Display::GetForcedDeviceScaleFactor();
 
@@ skipping 332 matching lines @@
   return false;
 }
 
 void PlatformScreenOzone::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display