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

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

Issue 11958004: Make new-style page scale work on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Delete maxScrollOffsetChangedByDeviceScaleFactor test Created 7 years, 11 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_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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // Shows the disambiguation popup 242 // Shows the disambiguation popup
243 // |target_rect| --> window coordinates which |zoomed_bitmap| represents 243 // |target_rect| --> window coordinates which |zoomed_bitmap| represents
244 // |zoomed_bitmap| --> magnified image of potential touch targets 244 // |zoomed_bitmap| --> magnified image of potential touch targets
245 void ShowDisambiguationPopup( 245 void ShowDisambiguationPopup(
246 const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap); 246 const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap);
247 247
248 // -------------------------------------------------------------------------- 248 // --------------------------------------------------------------------------
249 // Methods called from native code 249 // Methods called from native code
250 // -------------------------------------------------------------------------- 250 // --------------------------------------------------------------------------
251 251
252 gfx::Rect GetBounds() const; 252 gfx::Size GetPhysicalSize() const;
253 gfx::Size GetDIPSize() const;
253 254
254 void AttachLayer(scoped_refptr<cc::Layer> layer); 255 void AttachLayer(scoped_refptr<cc::Layer> layer);
255 void RemoveLayer(scoped_refptr<cc::Layer> layer); 256 void RemoveLayer(scoped_refptr<cc::Layer> layer);
256 void DidProduceRendererFrame(); 257 void DidProduceRendererFrame();
257 258
258 private: 259 private:
259 class ContentViewUserData; 260 class ContentViewUserData;
260 261
261 friend class ContentViewUserData; 262 friend class ContentViewUserData;
262 virtual ~ContentViewCoreImpl(); 263 virtual ~ContentViewCoreImpl();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ui::WindowAndroid* window_android_; 317 ui::WindowAndroid* window_android_;
317 318
318 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 319 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
319 }; 320 };
320 321
321 bool RegisterContentViewCore(JNIEnv* env); 322 bool RegisterContentViewCore(JNIEnv* env);
322 323
323 } // namespace content 324 } // namespace content
324 325
325 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 326 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698