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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 23364004: Implementation of device metrics emulation in render view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed reviewers comments Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 793
794 if (resize_lock_) 794 if (resize_lock_)
795 return false; 795 return false;
796 796
797 if (host_->should_auto_resize()) 797 if (host_->should_auto_resize())
798 return false; 798 return false;
799 if (!host_->is_accelerated_compositing_active()) 799 if (!host_->is_accelerated_compositing_active())
800 return false; 800 return false;
801 801
802 gfx::Size desired_size = window_->bounds().size(); 802 gfx::Size desired_size = window_->bounds().size();
803 if (!expected_rendered_size_.IsEmpty())
804 desired_size = expected_rendered_size_;
803 if (desired_size == current_frame_size_) 805 if (desired_size == current_frame_size_)
804 return false; 806 return false;
805 807
806 aura::RootWindow* root_window = window_->GetRootWindow(); 808 aura::RootWindow* root_window = window_->GetRootWindow();
807 if (!root_window) 809 if (!root_window)
808 return false; 810 return false;
809 811
810 ui::Compositor* compositor = root_window->compositor(); 812 ui::Compositor* compositor = root_window->compositor();
811 if (!compositor) 813 if (!compositor)
812 return false; 814 return false;
813 815
814 return true; 816 return true;
815 } 817 }
816 818
817 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock( 819 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock(
818 bool defer_compositor_lock) { 820 bool defer_compositor_lock) {
819 gfx::Size desired_size = window_->bounds().size(); 821 gfx::Size desired_size = window_->bounds().size();
822 if (!expected_rendered_size_.IsEmpty())
823 desired_size = expected_rendered_size_;
820 return scoped_ptr<ResizeLock>(new CompositorResizeLock( 824 return scoped_ptr<ResizeLock>(new CompositorResizeLock(
821 window_->GetRootWindow(), 825 window_->GetRootWindow(),
822 desired_size, 826 desired_size,
823 defer_compositor_lock, 827 defer_compositor_lock,
824 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); 828 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs)));
825 } 829 }
826 830
827 gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const { 831 gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const {
828 return window_; 832 return window_;
829 } 833 }
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 return window_->GetToplevelWindow()->GetBoundsInScreen(); 2079 return window_->GetToplevelWindow()->GetBoundsInScreen();
2076 #endif 2080 #endif
2077 } 2081 }
2078 2082
2079 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, 2083 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type,
2080 InputEventAckState ack_result) { 2084 InputEventAckState ack_result) {
2081 if (touch_editing_client_) 2085 if (touch_editing_client_)
2082 touch_editing_client_->GestureEventAck(gesture_event_type); 2086 touch_editing_client_->GestureEventAck(gesture_event_type);
2083 } 2087 }
2084 2088
2089 void RenderWidgetHostViewAura::SetExpectedRenderedSize(const gfx::Size& size) {
2090 expected_rendered_size_ = size;
2091 }
2092
2085 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( 2093 void RenderWidgetHostViewAura::ProcessAckedTouchEvent(
2086 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { 2094 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
2087 ScopedVector<ui::TouchEvent> events; 2095 ScopedVector<ui::TouchEvent> events;
2088 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, 2096 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events,
2089 SCREEN_COORDINATES)) 2097 SCREEN_COORDINATES))
2090 return; 2098 return;
2091 2099
2092 aura::RootWindow* root = window_->GetRootWindow(); 2100 aura::RootWindow* root = window_->GetRootWindow();
2093 // |root| is NULL during tests. 2101 // |root| is NULL during tests.
2094 if (!root) 2102 if (!root)
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
3369 RenderWidgetHost* widget) { 3377 RenderWidgetHost* widget) {
3370 return new RenderWidgetHostViewAura(widget); 3378 return new RenderWidgetHostViewAura(widget);
3371 } 3379 }
3372 3380
3373 // static 3381 // static
3374 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3382 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3375 GetScreenInfoForWindow(results, NULL); 3383 GetScreenInfoForWindow(results, NULL);
3376 } 3384 }
3377 3385
3378 } // namespace content 3386 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698