GetScaleFactorForNativeView should return scale factor in float

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/video_frame.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "net/base/filename_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/base/layout.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gl/io_surface_support_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/gfx/win/dpi.h"
 #endif
 
 namespace content {
 namespace {
 
 // Convenience macro: Short-circuit a pass for the tests where platform support
 // for forced-compositing mode (or disabled-compositing mode) is lacking.
 #define SET_UP_SURFACE_OR_PASS_TEST(wait_message)  \
   if (!SetUpSourceSurface(wait_message)) {  \
     LOG(WARNING)  \
         << ("Blindly passing this test: This platform does not support "  \
             "forced compositing (or forced-disabled compositing) mode.");  \
     return;  \
   }
 
-// Convenience macro: Short-circuit a pass for platforms where setting up
-// high-DPI fails.
-#define PASS_TEST_IF_SCALE_FACTOR_NOT_SUPPORTED(factor) \
-  if (ui::GetScaleForScaleFactor( \
-          GetScaleFactorForView(GetRenderWidgetHostView())) != factor) {  \
-    LOG(WARNING) << "Blindly passing this test: failed to set up "  \
-                    "scale factor: " << factor;  \
-    return false;  \
-  }
-
 // Common base class for browser tests.  This is subclassed twice: Once to test
 // the browser in forced-compositing mode, and once to test with compositing
 // mode disabled.
 class RenderWidgetHostViewBrowserTest : public ContentBrowserTest {
  public:
   RenderWidgetHostViewBrowserTest()
       : frame_size_(400, 300),
         callback_invoke_count_(0),
         frames_captured_(0) {}
 
@@ skipping 726 matching lines @@
 #if defined(OS_WIN)
     gfx::ForceHighDPISupportForTesting(scale());
     gfx::EnableHighDPISupport();
 #endif
   }
 
   float scale() const { return kScale; }
 
  private:
   virtual bool ShouldContinueAfterTestURLLoad() OVERRIDE {
-    PASS_TEST_IF_SCALE_FACTOR_NOT_SUPPORTED(scale());
+    // Short-circuit a pass for platforms where setting up high-DPI fails.
+    if (ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(
+            GetScaleFactorForView(GetRenderWidgetHostView()))) != scale()) {
+      LOG(WARNING) << "Blindly passing this test: failed to set up "
+          "scale factor: " << scale();
+      return false;
+    }
     return true;
   }
 
   const float kScale;
 
   DISALLOW_COPY_AND_ASSIGN(CompositingRenderWidgetHostViewTabCaptureHighDPI);
 };
 
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewTabCaptureHighDPI,
                        CopyFromCompositingSurface) {
@@ skipping 44 matching lines @@
                         CompositingRenderWidgetHostViewBrowserTestTabCapture,
                         testing::ValuesIn(kAllCompositingModes));
 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing,
                         CompositingRenderWidgetHostViewTabCaptureHighDPI,
                         testing::ValuesIn(kAllCompositingModes));
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 }  // namespace
 }  // namespace content