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

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

Issue 1409833004: Add DeviceDisplayInfo getter in WindowAndroid. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failing bot, revert RWHVA changes, add NOTIMPLEMENTED to some functions in screen_android Created 4 years, 10 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.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index d70219a71ef275a274ba0f2cb91ad79fe20f34a8..24dfd2c1a00acd05e17fb3b1155b40b5243afaf6 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -214,8 +214,10 @@ ContentViewCoreImpl::ContentViewCoreImpl(
web_contents_(static_cast<WebContentsImpl*>(web_contents)),
root_layer_(cc::SolidColorLayer::Create(Compositor::LayerSettings())),
page_scale_(1),
- dpi_scale_(ui::GetScaleFactorForNativeView(this)),
window_android_(window_android),
+ // window_android_ must be initialized before calling
+ // GetScaleFactorForNativeView since this method uses window_android_
+ dpi_scale_(ui::GetScaleFactorForNativeView(this)),
device_orientation_(0),
accessibility_enabled_(false) {
CHECK(web_contents) <<
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698