| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index d5f2a617cc7ced2cc2b1211b1c57645ab9db3e88..57bbea7b6b7982924e24de3791c9febe4c6cb6a5 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -1423,8 +1423,7 @@ void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
|
| WasResized();
|
|
|
| if (touch_emulator_) {
|
| - touch_emulator_->SetDeviceScaleFactor(
|
| - view_.get() ? content::GetScaleFactorForView(view_.get()) : 1.0f);
|
| + touch_emulator_->SetDeviceScaleFactor(GetScaleFactorForView(view_.get()));
|
| }
|
| }
|
|
|
| @@ -1959,9 +1958,8 @@ void RenderWidgetHostImpl::SetTouchEventEmulationEnabled(
|
| bool enabled, ui::GestureProviderConfigType config_type) {
|
| if (enabled) {
|
| if (!touch_emulator_) {
|
| - touch_emulator_.reset(new TouchEmulator(
|
| - this,
|
| - view_.get() ? content::GetScaleFactorForView(view_.get()) : 1.0f));
|
| + touch_emulator_.reset(
|
| + new TouchEmulator(this, GetScaleFactorForView(view_.get())));
|
| }
|
| touch_emulator_->Enable(config_type);
|
| } else {
|
|
|