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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 181723006: Handle mac trackpad zoom via GesturePinch events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jdduke CR feedback and fix win build errors Created 6 years, 9 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 479 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
480 virtual bool PreHandleKeyboardEvent( 480 virtual bool PreHandleKeyboardEvent(
481 const NativeWebKeyboardEvent& event, 481 const NativeWebKeyboardEvent& event,
482 bool* is_keyboard_shortcut) OVERRIDE; 482 bool* is_keyboard_shortcut) OVERRIDE;
483 virtual void HandleKeyboardEvent( 483 virtual void HandleKeyboardEvent(
484 const NativeWebKeyboardEvent& event) OVERRIDE; 484 const NativeWebKeyboardEvent& event) OVERRIDE;
485 virtual bool HandleWheelEvent( 485 virtual bool HandleWheelEvent(
486 const blink::WebMouseWheelEvent& event) OVERRIDE; 486 const blink::WebMouseWheelEvent& event) OVERRIDE;
487 virtual bool PreHandleGestureEvent( 487 virtual bool PreHandleGestureEvent(
488 const blink::WebGestureEvent& event) OVERRIDE; 488 const blink::WebGestureEvent& event) OVERRIDE;
489 virtual bool HandleGestureEvent(
490 const blink::WebGestureEvent& event) OVERRIDE;
489 virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE; 491 virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE;
490 #if defined(OS_WIN) 492 #if defined(OS_WIN)
491 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; 493 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
492 #endif 494 #endif
493 495
494 // RenderFrameHostManager::Delegate ------------------------------------------ 496 // RenderFrameHostManager::Delegate ------------------------------------------
495 497
496 virtual bool CreateRenderViewForRenderManager( 498 virtual bool CreateRenderViewForRenderManager(
497 RenderViewHost* render_view_host, 499 RenderViewHost* render_view_host,
498 int opener_route_id, 500 int opener_route_id,
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 bool closed_by_user_gesture_; 979 bool closed_by_user_gesture_;
978 980
979 // Minimum/maximum zoom percent. 981 // Minimum/maximum zoom percent.
980 int minimum_zoom_percent_; 982 int minimum_zoom_percent_;
981 int maximum_zoom_percent_; 983 int maximum_zoom_percent_;
982 // If true, the default zoom limits have been overriden for this tab, in which 984 // If true, the default zoom limits have been overriden for this tab, in which
983 // case we don't want saved settings to apply to it and we don't want to 985 // case we don't want saved settings to apply to it and we don't want to
984 // remember it. 986 // remember it.
985 bool temporary_zoom_settings_; 987 bool temporary_zoom_settings_;
986 988
989 // The raw accumulated zoom value and the actual zoom increments made for an
990 // an in-progress pinch gesture.
991 float totalPinchGestureAmount_;
992 int currentPinchZoomStepDelta_;
993
987 // The intrinsic size of the page. 994 // The intrinsic size of the page.
988 gfx::Size preferred_size_; 995 gfx::Size preferred_size_;
989 996
990 // The preferred size for content screen capture. When |capturer_count_| > 0, 997 // The preferred size for content screen capture. When |capturer_count_| > 0,
991 // this overrides |preferred_size_|. 998 // this overrides |preferred_size_|.
992 gfx::Size preferred_size_for_capture_; 999 gfx::Size preferred_size_for_capture_;
993 1000
994 #if defined(OS_ANDROID) 1001 #if defined(OS_ANDROID)
995 // Date time chooser opened by this tab. 1002 // Date time chooser opened by this tab.
996 // Only used in Android since all other platforms use a multi field UI. 1003 // Only used in Android since all other platforms use a multi field UI.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 // Whether this WebContents is responsible for displaying a subframe in a 1047 // Whether this WebContents is responsible for displaying a subframe in a
1041 // different process from its parent page. 1048 // different process from its parent page.
1042 bool is_subframe_; 1049 bool is_subframe_;
1043 1050
1044 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1051 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1045 }; 1052 };
1046 1053
1047 } // namespace content 1054 } // namespace content
1048 1055
1049 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1056 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698