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

Unified Diff: content/browser/android/content_view_core_impl.h

Issue 23478022: [android_webview] Fixes for wrap_content layouts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index a575907f08ffae13a5cff1239045f1460e5d2666..864eb02efe0fe7381d8e2d49cf797b32bf175aa2 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -60,6 +60,8 @@ class ContentViewCoreImpl : public ContentViewCore,
virtual float GetDpiScale() const OVERRIDE;
virtual void RequestContentClipping(const gfx::Rect& clipping,
const gfx::Size& content_size) OVERRIDE;
+ virtual void SetViewportSizeDipOverride(
+ const gfx::Size& viewport_size) OVERRIDE;
// --------------------------------------------------------------------------
// Methods called from Java via JNI
@@ -351,6 +353,10 @@ class ContentViewCoreImpl : public ContentViewCore,
// Device scale factor.
float dpi_scale_;
+ // This allows for specifying the viewport in DIP pixels directly to avoid
+ // rounding errors.
+ gfx::Size viewport_dip_size_override_;
aelias_OOO_until_Jul13 2013/09/06 02:01:35 I don't like this and it shouldn't be needed. The
aelias_OOO_until_Jul13 2013/09/06 02:14:22 On second thought, I guess it probably has more to
mkosiba (inactive) 2013/09/06 18:23:09 yes and no. The reason I did this is that when the
aelias_OOO_until_Jul13 2013/09/06 22:27:47 OK. I agree you need a way to specify both values
+
// Variables used to keep track of frame timestamps and deadlines.
base::TimeDelta vsync_interval_;
base::TimeDelta expected_browser_composite_time_;

Powered by Google App Engine
This is Rietveld 408576698