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

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: 80-col limit 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // Shows the disambiguation popup 251 // Shows the disambiguation popup
252 // |target_rect| --> window coordinates which |zoomed_bitmap| represents 252 // |target_rect| --> window coordinates which |zoomed_bitmap| represents
253 // |zoomed_bitmap| --> magnified image of potential touch targets 253 // |zoomed_bitmap| --> magnified image of potential touch targets
254 void ShowDisambiguationPopup( 254 void ShowDisambiguationPopup(
255 const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap); 255 const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap);
256 256
257 // -------------------------------------------------------------------------- 257 // --------------------------------------------------------------------------
258 // Methods called from native code 258 // Methods called from native code
259 // -------------------------------------------------------------------------- 259 // --------------------------------------------------------------------------
260 260
261 gfx::Rect GetBounds() const; 261 gfx::Size GetPhysicalSize() const;
262 gfx::Size GetDIPSize() const;
262 263
263 void AttachLayer(scoped_refptr<cc::Layer> layer); 264 void AttachLayer(scoped_refptr<cc::Layer> layer);
264 void RemoveLayer(scoped_refptr<cc::Layer> layer); 265 void RemoveLayer(scoped_refptr<cc::Layer> layer);
265 void DidProduceRendererFrame(); 266 void DidProduceRendererFrame();
266 267
267 private: 268 private:
268 class ContentViewUserData; 269 class ContentViewUserData;
269 270
270 friend class ContentViewUserData; 271 friend class ContentViewUserData;
271 virtual ~ContentViewCoreImpl(); 272 virtual ~ContentViewCoreImpl();
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 ui::WindowAndroid* window_android_; 328 ui::WindowAndroid* window_android_;
328 329
329 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 330 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
330 }; 331 };
331 332
332 bool RegisterContentViewCore(JNIEnv* env); 333 bool RegisterContentViewCore(JNIEnv* env);
333 334
334 } // namespace content 335 } // namespace content
335 336
336 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 337 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698