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

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

Issue 1525933002: Support device scale factor test with popups in LayoutTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 583745c10218aa406f0be712eb2bf52626808b97..c3a2eb5ade95c60d6586ab8cae7bc6b1bc5e8224 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -32,6 +32,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/url_constants.h"
#include "content/public/common/web_preferences.h"
@@ -265,8 +266,8 @@ BlinkTestRunner::BlinkTestRunner(RenderView* render_view)
focused_view_(NULL),
is_main_window_(false),
focus_on_next_commit_(false),
- leak_detector_(new LeakDetector(this)) {
-}
+ leak_detector_(new LeakDetector(this)),
+ device_scale_factor_(1.f) {}
BlinkTestRunner::~BlinkTestRunner() {
}
@@ -512,7 +513,11 @@ void BlinkTestRunner::SimulateWebNotificationClick(const std::string& title,
}
void BlinkTestRunner::SetDeviceScaleFactor(float factor) {
+ if (device_scale_factor_ == factor)
+ return;
oshima 2015/12/15 20:21:37 I'm doing this to avoid resize request from host,
tkent 2015/12/16 06:40:01 Hmm, this looks a reasonable solution.
+ device_scale_factor_ = factor;
content::SetDeviceScaleFactor(render_view(), factor);
+ Send(new ShellViewHostMsg_SetDeviceScaleFactor(routing_id(), factor));
}
void BlinkTestRunner::SetDeviceColorProfile(const std::string& name) {
@@ -760,6 +765,11 @@ void BlinkTestRunner::OnWebTestProxyBaseDestroy(
test_runner::WebTestProxyBase* proxy) {
}
+blink::WebPoint BlinkTestRunner::ConvertDIPToNative(
+ const blink::WebPoint& point_in_dip) const {
+ return blink::WebPoint(point_in_dip.x * device_scale_factor_,
+ point_in_dip.y * device_scale_factor_);
+}
bool BlinkTestRunner::AddMediaStreamVideoSourceAndTrack(
blink::WebMediaStream* stream) {
DCHECK(stream);

Powered by Google App Engine
This is Rietveld 408576698