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

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

Issue 688253002: Implemented smooth scrolling using xinput2 in X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabled coalescing for all scroll events Created 5 years 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 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 // the WebContents creation time. 1208 // the WebContents creation time.
1209 base::TimeTicks last_active_time_; 1209 base::TimeTicks last_active_time_;
1210 1210
1211 // See description above setter. 1211 // See description above setter.
1212 bool closed_by_user_gesture_; 1212 bool closed_by_user_gesture_;
1213 1213
1214 // Minimum/maximum zoom percent. 1214 // Minimum/maximum zoom percent.
1215 int minimum_zoom_percent_; 1215 int minimum_zoom_percent_;
1216 int maximum_zoom_percent_; 1216 int maximum_zoom_percent_;
1217 1217
1218 // Used to correctly handle integer zooming through a smooth scroll device.
1219 float zoom_scroll_amount_;
bokan 2015/12/01 18:29:27 Please initialize this
1220
1218 // The intrinsic size of the page. 1221 // The intrinsic size of the page.
1219 gfx::Size preferred_size_; 1222 gfx::Size preferred_size_;
1220 1223
1221 // The preferred size for content screen capture. When |capturer_count_| > 0, 1224 // The preferred size for content screen capture. When |capturer_count_| > 0,
1222 // this overrides |preferred_size_|. 1225 // this overrides |preferred_size_|.
1223 gfx::Size preferred_size_for_capture_; 1226 gfx::Size preferred_size_for_capture_;
1224 1227
1225 #if defined(OS_ANDROID) && !defined(USE_AURA) 1228 #if defined(OS_ANDROID) && !defined(USE_AURA)
1226 // Date time chooser opened by this tab. 1229 // Date time chooser opened by this tab.
1227 // Only used in Android since all other platforms use a multi field UI. 1230 // Only used in Android since all other platforms use a multi field UI.
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 // Adds/removes a callback called on creation of each new WebContents. 1356 // Adds/removes a callback called on creation of each new WebContents.
1354 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1357 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1355 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1358 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1356 1359
1357 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1360 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1358 }; 1361 };
1359 1362
1360 } // namespace content 1363 } // namespace content
1361 1364
1362 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1365 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698