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

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

Issue 899283004: Remove pinch zoom handling from the browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 #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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 535
536 void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override; 536 void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override;
537 void RenderWidgetGotFocus(RenderWidgetHostImpl* render_widget_host) override; 537 void RenderWidgetGotFocus(RenderWidgetHostImpl* render_widget_host) override;
538 void RenderWidgetWasResized(RenderWidgetHostImpl* render_widget_host, 538 void RenderWidgetWasResized(RenderWidgetHostImpl* render_widget_host,
539 bool width_changed) override; 539 bool width_changed) override;
540 bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 540 bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
541 bool* is_keyboard_shortcut) override; 541 bool* is_keyboard_shortcut) override;
542 void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override; 542 void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
543 bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override; 543 bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override;
544 bool PreHandleGestureEvent(const blink::WebGestureEvent& event) override; 544 bool PreHandleGestureEvent(const blink::WebGestureEvent& event) override;
545 bool HandleGestureEvent(const blink::WebGestureEvent& event) override;
546 void DidSendScreenRects(RenderWidgetHostImpl* rwh) override; 545 void DidSendScreenRects(RenderWidgetHostImpl* rwh) override;
547 BrowserAccessibilityManager* GetRootBrowserAccessibilityManager() override; 546 BrowserAccessibilityManager* GetRootBrowserAccessibilityManager() override;
548 BrowserAccessibilityManager* GetOrCreateRootBrowserAccessibilityManager() 547 BrowserAccessibilityManager* GetOrCreateRootBrowserAccessibilityManager()
549 override; 548 override;
550 549
551 // RenderFrameHostManager::Delegate ------------------------------------------ 550 // RenderFrameHostManager::Delegate ------------------------------------------
552 551
553 bool CreateRenderViewForRenderManager( 552 bool CreateRenderViewForRenderManager(
554 RenderViewHost* render_view_host, 553 RenderViewHost* render_view_host,
555 int opener_route_id, 554 int opener_route_id,
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 // the WebContents creation time. 1129 // the WebContents creation time.
1131 base::TimeTicks last_active_time_; 1130 base::TimeTicks last_active_time_;
1132 1131
1133 // See description above setter. 1132 // See description above setter.
1134 bool closed_by_user_gesture_; 1133 bool closed_by_user_gesture_;
1135 1134
1136 // Minimum/maximum zoom percent. 1135 // Minimum/maximum zoom percent.
1137 int minimum_zoom_percent_; 1136 int minimum_zoom_percent_;
1138 int maximum_zoom_percent_; 1137 int maximum_zoom_percent_;
1139 1138
1140 // The raw accumulated zoom value and the actual zoom increments made for an
1141 // an in-progress pinch gesture.
1142 float totalPinchGestureAmount_;
1143 int currentPinchZoomStepDelta_;
1144
1145 // The intrinsic size of the page. 1139 // The intrinsic size of the page.
1146 gfx::Size preferred_size_; 1140 gfx::Size preferred_size_;
1147 1141
1148 // The preferred size for content screen capture. When |capturer_count_| > 0, 1142 // The preferred size for content screen capture. When |capturer_count_| > 0,
1149 // this overrides |preferred_size_|. 1143 // this overrides |preferred_size_|.
1150 gfx::Size preferred_size_for_capture_; 1144 gfx::Size preferred_size_for_capture_;
1151 1145
1152 #if defined(OS_ANDROID) 1146 #if defined(OS_ANDROID)
1153 // Date time chooser opened by this tab. 1147 // Date time chooser opened by this tab.
1154 // Only used in Android since all other platforms use a multi field UI. 1148 // Only used in Android since all other platforms use a multi field UI.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 // Adds/removes a callback called on creation of each new WebContents. 1266 // Adds/removes a callback called on creation of each new WebContents.
1273 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1267 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1274 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1268 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1275 1269
1276 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1270 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1277 }; 1271 };
1278 1272
1279 } // namespace content 1273 } // namespace content
1280 1274
1281 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1275 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698