Reland "Enforce constant size and device scale factor for surfaces" with fixes

android_webview/browser/surfaces_instance.cc

Index: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index b8599fe91175b5e7f1707cb68f7d8cf789bf212a..a04bf5f5a78017d9cad14fe8a81924f63c7da809 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -139,14 +139,16 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
   frame.metadata.begin_frame_ack =
       cc::BeginFrameAck::CreateManualAckWithDamage();
   frame.render_pass_list.push_back(std::move(render_pass));
+  frame.metadata.device_scale_factor = 1.f;
   frame.metadata.referenced_surfaces = child_ids_;
 
-  if (!root_id_.is_valid() || frame_size != surface_size_) {
+  if (!root_id_.is_valid() || viewport != surface_size_) {
     root_id_ = local_surface_id_allocator_->GenerateId();
-    surface_size_ = frame_size;
+    surface_size_ = viewport;
     display_->SetLocalSurfaceId(root_id_, 1.f);
   }
-  support_->SubmitCompositorFrame(root_id_, std::move(frame));
+  bool result = support_->SubmitCompositorFrame(root_id_, std::move(frame));
+  DCHECK(result);
 
   display_->Resize(viewport);
   display_->DrawAndSwap();
@@ -186,7 +188,9 @@ void SurfacesInstance::SetSolidColorRootFrame() {
   frame.metadata.begin_frame_ack =
       cc::BeginFrameAck::CreateManualAckWithDamage();
   frame.metadata.referenced_surfaces = child_ids_;
-  support_->SubmitCompositorFrame(root_id_, std::move(frame));
+  frame.metadata.device_scale_factor = 1;
+  bool result = support_->SubmitCompositorFrame(root_id_, std::move(frame));
+  DCHECK(result);
 }
 
 void SurfacesInstance::DidReceiveCompositorFrameAck(