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

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

Issue 300863002: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 6 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 unified diff | Download patch
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 // RenderWidgetHostView override. 456 // RenderWidgetHostView override.
457 virtual gfx::Rect GetViewBounds() const OVERRIDE { 457 virtual gfx::Rect GetViewBounds() const OVERRIDE {
458 return bounds_; 458 return bounds_;
459 } 459 }
460 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, 460 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
461 InputEventAckState ack_result) OVERRIDE { 461 InputEventAckState ack_result) OVERRIDE {
462 acked_event_ = touch.event; 462 acked_event_ = touch.event;
463 ++acked_event_count_; 463 ++acked_event_count_;
464 } 464 }
465 virtual void UnhandledWheelEvent(const WebMouseWheelEvent& event) OVERRIDE { 465 virtual void ProcessedWheelEvent(const blink::WebMouseWheelEvent& event,
466 unhandled_wheel_event_count_++; 466 bool consumed) OVERRIDE {
467 unhandled_wheel_event_ = event; 467 if (!consumed) {
468 unhandled_wheel_event_count_++;
469 unhandled_wheel_event_ = event;
470 }
468 } 471 }
469 virtual void GestureEventAck(const WebGestureEvent& event, 472 virtual void GestureEventAck(const WebGestureEvent& event,
470 InputEventAckState ack_result) OVERRIDE { 473 InputEventAckState ack_result) OVERRIDE {
471 gesture_event_type_ = event.type; 474 gesture_event_type_ = event.type;
472 ack_result_ = ack_result; 475 ack_result_ = ack_result;
473 } 476 }
474 virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE { 477 virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE {
475 if (use_fake_physical_backing_size_) 478 if (use_fake_physical_backing_size_)
476 return mock_physical_backing_size_; 479 return mock_physical_backing_size_;
477 return TestRenderWidgetHostView::GetPhysicalBackingSize(); 480 return TestRenderWidgetHostView::GetPhysicalBackingSize();
(...skipping 2156 matching lines...) Expand 10 before | Expand all | Expand 10 after
2634 2637
2635 // Tests RWHI::ForwardTouchEventWithLatencyInfo(). 2638 // Tests RWHI::ForwardTouchEventWithLatencyInfo().
2636 PressTouchPoint(0, 1); 2639 PressTouchPoint(0, 1);
2637 SendTouchEvent(); 2640 SendTouchEvent();
2638 CheckLatencyInfoComponentInMessage( 2641 CheckLatencyInfoComponentInMessage(
2639 process_, GetLatencyComponentId(), WebInputEvent::TouchStart); 2642 process_, GetLatencyComponentId(), WebInputEvent::TouchStart);
2640 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED); 2643 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED);
2641 } 2644 }
2642 2645
2643 } // namespace content 2646 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698