Chromium Code Reviews| 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 c49c4008940edc5f8ebf6c74c1c10ffca2da0fe4..7d95e77713cf274b6f237847967c0c44822cdd0c 100644 |
| --- a/content/browser/android/content_view_core_impl.cc |
| +++ b/content/browser/android/content_view_core_impl.cc |
| @@ -217,12 +217,6 @@ ContentViewCoreImpl::ContentViewCoreImpl( |
| dpi_scale_(dpi_scale), |
| device_orientation_(0), |
| accessibility_enabled_(false) { |
| - GetViewAndroid()->SetLayer(cc::Layer::Create()); |
| - gfx::Size physical_size( |
| - Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj), |
| - Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj)); |
| - GetViewAndroid()->GetLayer()->SetBounds(physical_size); |
| - |
| // Currently, the only use case we have for overriding a user agent involves |
| // spoofing a desktop Linux user agent for "Request desktop site". |
| // Automatically set it for all WebContents so that it is available when a |
| @@ -722,16 +716,6 @@ gfx::Size ContentViewCoreImpl::GetViewSize() const { |
| return size; |
| } |
| -gfx::Size ContentViewCoreImpl::GetPhysicalBackingSize() const { |
| - JNIEnv* env = AttachCurrentThread(); |
| - ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env); |
| - if (j_obj.is_null()) |
| - return gfx::Size(); |
| - return gfx::Size( |
| - Java_ContentViewCore_getPhysicalBackingWidthPix(env, j_obj), |
| - Java_ContentViewCore_getPhysicalBackingHeightPix(env, j_obj)); |
| -} |
| - |
| gfx::Size ContentViewCoreImpl::GetViewportSizePix() const { |
| JNIEnv* env = AttachCurrentThread(); |
| ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env); |
| @@ -1250,11 +1234,7 @@ void ContentViewCoreImpl::RemoveJavascriptInterface( |
| void ContentViewCoreImpl::WasResized(JNIEnv* env, |
| const JavaParamRef<jobject>& obj) { |
| - gfx::Size physical_size( |
| - Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj), |
| - Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj)); |
| - GetViewAndroid()->GetLayer()->SetBounds(physical_size); |
| - |
| + GetViewAndroid()->UpdateLayerBounds(); |
|
boliu
2016/12/06 23:15:45
hmm, why is this still needed? did physical bounds
Jinsuk Kim
2016/12/07 12:36:28
Removed.
|
| SendScreenRectsAndResizeWidget(); |
| } |
| @@ -1574,6 +1554,7 @@ jlong Init(JNIEnv* env, |
| "A ContentViewCoreImpl should be created with a valid WebContents."; |
| ui::ViewAndroid* view_android = web_contents->GetView()->GetNativeView(); |
| view_android->SetDelegate(jview_android_delegate); |
| + view_android->SetLayer(cc::Layer::Create()); |
|
boliu
2016/12/06 23:15:45
is this to avoid null checks in ViewAndroid for up
Jinsuk Kim
2016/12/07 12:36:28
Yes, also the line now looked like an odd one out
|
| ui::WindowAndroid* window_android = |
| reinterpret_cast<ui::WindowAndroid*>(jwindow_android); |