| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 217537)
|
| +++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
|
| @@ -807,6 +807,7 @@
|
| if (!host_->should_auto_resize() &&
|
| !resize_lock_.get() &&
|
| desired_size != current_frame_size_ &&
|
| + !device_emulation_enabled_ &&
|
| host_->is_accelerated_compositing_active()) {
|
| aura::RootWindow* root_window = window_->GetRootWindow();
|
| ui::Compositor* compositor = root_window ?
|
| @@ -1984,6 +1985,10 @@
|
| touch_editing_client_->GestureEventAck(gesture_event_type);
|
| }
|
|
|
| +void RenderWidgetHostViewAura::EmulateDevice(bool enabled) {
|
| + device_emulation_enabled_ = enabled;
|
| +}
|
| +
|
| void RenderWidgetHostViewAura::ProcessAckedTouchEvent(
|
| const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
|
| ScopedVector<ui::TouchEvent> events;
|
|
|