Revert of Enforce constant size and device scale factor for surfaces

android_webview/browser/surfaces_instance.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
@@ skipping 121 matching lines @@
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_rect),
                        gfx::Rect(quad_state->quad_layer_rect), child_id,
                        cc::SurfaceDrawQuadType::PRIMARY, nullptr);
 
   cc::CompositorFrame frame;
   // We draw synchronously, so acknowledge a manual BeginFrame.
   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_) {
     root_id_ = local_surface_id_allocator_->GenerateId();
     surface_size_ = frame_size;
     display_->SetLocalSurfaceId(root_id_, 1.f);
   }
-  bool result = support_->SubmitCompositorFrame(root_id_, std::move(frame));
-  DCHECK(result);
+  support_->SubmitCompositorFrame(root_id_, std::move(frame));
 
   display_->Resize(viewport);
   display_->DrawAndSwap();
 }
 
 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) {
   DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) ==
          child_ids_.end());
   child_ids_.push_back(child_id);
   if (root_id_.is_valid())
@@ skipping 19 matching lines @@
                      SkBlendMode::kSrcOver, 0);
   cc::SolidColorDrawQuad* solid_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>();
   solid_quad->SetNew(quad_state, rect, rect, SK_ColorBLACK, false);
   cc::CompositorFrame frame;
   frame.render_pass_list.push_back(std::move(render_pass));
   // We draw synchronously, so acknowledge a manual BeginFrame.
   frame.metadata.begin_frame_ack =
       cc::BeginFrameAck::CreateManualAckWithDamage();
   frame.metadata.referenced_surfaces = child_ids_;
-  frame.metadata.device_scale_factor = 1;
-  bool result = support_->SubmitCompositorFrame(root_id_, std::move(frame));
-  DCHECK(result);
+  support_->SubmitCompositorFrame(root_id_, std::move(frame));
 }
 
 void SurfacesInstance::DidReceiveCompositorFrameAck(
     const cc::ReturnedResourceArray& resources) {
   ReclaimResources(resources);
 }
 
 void SurfacesInstance::OnBeginFrame(const cc::BeginFrameArgs& args) {}
 
 void SurfacesInstance::WillDrawSurface(
     const cc::LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {}
 
 void SurfacesInstance::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   // Root surface should have no resources to return.
   CHECK(resources.empty());
 }
 
 }  // namespace android_webview