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

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 11099007: Divide gesture events by dpi scale if IsDIPEnabled(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_helper.h" 10 #include "base/android/jni_helper.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // -------------------------------------------------------------------------- 225 // --------------------------------------------------------------------------
226 226
227 void InitJNI(JNIEnv* env, jobject obj); 227 void InitJNI(JNIEnv* env, jobject obj);
228 228
229 void InitWebContents(content::WebContents* web_contents); 229 void InitWebContents(content::WebContents* web_contents);
230 230
231 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid(); 231 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
232 232
233 int GetTouchPadding(); 233 int GetTouchPadding();
234 234
235 void SendGestureEvent(WebKit::WebInputEvent::Type type, long time_ms, 235 float DpiScale() const;
236 int x, int y); 236 WebKit::WebGestureEvent MakeGestureEvent(WebKit::WebInputEvent::Type type,
237 237 long time_ms, int x, int y) const;
238 struct JavaObject; 238 struct JavaObject;
239 JavaObject* java_object_; 239 JavaObject* java_object_;
240 240
241 // A weak reference to the Java ContentViewCore object. 241 // A weak reference to the Java ContentViewCore object.
242 JavaObjectWeakGlobalRef java_ref_; 242 JavaObjectWeakGlobalRef java_ref_;
243 243
244 NotificationRegistrar notification_registrar_; 244 NotificationRegistrar notification_registrar_;
245 245
246 // Reference to the current WebContents used to determine how and what to 246 // Reference to the current WebContents used to determine how and what to
247 // display in the ContentViewCore. 247 // display in the ContentViewCore.
248 WebContentsImpl* web_contents_; 248 WebContentsImpl* web_contents_;
249 249
250 // Whether the renderer backing this ContentViewCore has crashed. 250 // Whether the renderer backing this ContentViewCore has crashed.
251 bool tab_crashed_; 251 bool tab_crashed_;
252 252
253 float dpi_scale_;
254
253 // The owning window that has a hold of main application activity. 255 // The owning window that has a hold of main application activity.
254 ui::WindowAndroid* window_android_; 256 ui::WindowAndroid* window_android_;
255 257
256 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 258 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
257 }; 259 };
258 260
259 bool RegisterContentViewCore(JNIEnv* env); 261 bool RegisterContentViewCore(JNIEnv* env);
260 262
261 } // namespace content 263 } // namespace content
262 264
263 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 265 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698