Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2032)

Unified Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 2085153002: Adjust test expectations for infinite-size images. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 76af0616fe51b6069d86bda1221e5dd23d7a1d0c..5100af116554847d6c07ce1f7991f7e3bcd0178d 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -37,6 +37,7 @@
#include "components/test_runner/web_test_interfaces.h"
#include "components/test_runner/web_test_proxy.h"
#include "components/test_runner/web_test_runner.h"
+#include "content/common/content_switches_internal.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/service_registry.h"
#include "content/public/common/url_constants.h"
@@ -501,8 +502,10 @@ void BlinkTestRunner::SimulateWebNotificationClose(const std::string& title,
by_user));
}
-void BlinkTestRunner::SetDeviceScaleFactor(float factor) {
- content::SetDeviceScaleFactor(render_view(), factor);
+bool BlinkTestRunner::SetDeviceScaleFactor(float factor) {
+ RenderView* rv = render_view();
+ content::SetDeviceScaleFactor(rv, factor);
+ return IsUseZoomForDSFEnabled();
}
void BlinkTestRunner::EnableUseZoomForDSF() {

Powered by Google App Engine
This is Rietveld 408576698