aw: Remove global AllowWait on UI thread

content/browser/android/synchronous_compositor_host.cc

 // Copyright 2015 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 "content/browser/android/synchronous_compositor_host.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "content/browser/android/synchronous_compositor_browser_filter.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/android/sync_compositor_messages.h"
 #include "content/common/android/sync_compositor_statics.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_switches.h"
@@ skipping 92 matching lines @@
     const gfx::Size& viewport_size,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {
   SyncCompositorDemandDrawHwParams params(viewport_size,
                                           viewport_rect_for_tile_priority,
                                           transform_for_tile_priority);
   uint32_t compositor_frame_sink_id;
   base::Optional<cc::CompositorFrame> compositor_frame;
   SyncCompositorCommonRendererParams common_renderer_params;
 
-  if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
-          routing_id_, params, &common_renderer_params,
-          &compositor_frame_sink_id, &compositor_frame))) {
-    return SynchronousCompositor::Frame();
+  {
+    base::ThreadRestrictions::ScopedAllowWait wait;
+    if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
+            routing_id_, params, &common_renderer_params,
+            &compositor_frame_sink_id, &compositor_frame))) {
+      return SynchronousCompositor::Frame();
+    }
   }
 
   ProcessCommonParams(common_renderer_params);
 
   if (!compositor_frame)
     return SynchronousCompositor::Frame();
 
   SynchronousCompositor::Frame frame;
   frame.frame.reset(new cc::CompositorFrame);
   frame.compositor_frame_sink_id = compositor_frame_sink_id;
@@ skipping 30 matching lines @@
 };
 
 }
 
 bool SynchronousCompositorHost::DemandDrawSwInProc(SkCanvas* canvas) {
   SyncCompositorCommonRendererParams common_renderer_params;
   bool success = false;
   std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   ScopedSetSkCanvas set_sk_canvas(canvas);
   SyncCompositorDemandDrawSwParams params;  // Unused.
-  if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
-          routing_id_, params, &success, &common_renderer_params,
-          frame.get()))) {
-    return false;
+  {
+    base::ThreadRestrictions::ScopedAllowWait wait;
+    if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
+            routing_id_, params, &success, &common_renderer_params,
+            frame.get()))) {
+      return false;
+    }
   }
   if (!success)
     return false;
   ProcessCommonParams(common_renderer_params);
   UpdateFrameMetaData(std::move(frame->metadata));
   return true;
 }
 
 class SynchronousCompositorHost::ScopedSendZeroMemory {
  public:
@@ skipping 39 matching lines @@
   if (!buffer_size)
     return false;  // Overflow.
 
   SetSoftwareDrawSharedMemoryIfNeeded(stride, buffer_size);
   if (!software_draw_shm_)
     return false;
 
   std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   SyncCompositorCommonRendererParams common_renderer_params;
   bool success = false;
-  if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
-          routing_id_, params, &success, &common_renderer_params,
-          frame.get()))) {
-    return false;
+  {
+    base::ThreadRestrictions::ScopedAllowWait wait;
+    if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
+            routing_id_, params, &success, &common_renderer_params,
+            frame.get()))) {
+      return false;
+    }
   }
   ScopedSendZeroMemory send_zero_memory(this);
   if (!success)
     return false;
 
   ProcessCommonParams(common_renderer_params);
   UpdateFrameMetaData(std::move(frame->metadata));
 
   SkBitmap bitmap;
   if (!bitmap.installPixels(info, software_draw_shm_->shm.memory(), stride))
@@ skipping 29 matching lines @@
   set_shm_params.buffer_size = buffer_size;
   base::ProcessHandle renderer_process_handle =
       rwhva_->GetRenderWidgetHost()->GetProcess()->GetHandle();
   if (!software_draw_shm->shm.ShareToProcess(renderer_process_handle,
                                              &set_shm_params.shm_handle)) {
     return;
   }
 
   bool success = false;
   SyncCompositorCommonRendererParams common_renderer_params;
-  if (!sender_->Send(new SyncCompositorMsg_SetSharedMemory(
-          routing_id_, set_shm_params, &success, &common_renderer_params)) ||
-      !success) {
-    return;
+  {
+    base::ThreadRestrictions::ScopedAllowWait wait;
+    if (!sender_->Send(new SyncCompositorMsg_SetSharedMemory(
+            routing_id_, set_shm_params, &success, &common_renderer_params)) ||
+        !success) {
+      return;
+    }
   }
   software_draw_shm_ = std::move(software_draw_shm);
   ProcessCommonParams(common_renderer_params);
 }
 
 void SynchronousCompositorHost::SendZeroMemory() {
   // No need to check return value.
   sender_->Send(new SyncCompositorMsg_ZeroSharedMemory(routing_id_));
 }
 
@@ skipping 20 matching lines @@
   if (root_scroll_offset_ == root_offset)
     return;
   root_scroll_offset_ = root_offset;
   sender_->Send(
       new SyncCompositorMsg_SetScroll(routing_id_, root_scroll_offset_));
 }
 
 void SynchronousCompositorHost::SynchronouslyZoomBy(float zoom_delta,
                                                     const gfx::Point& anchor) {
   SyncCompositorCommonRendererParams common_renderer_params;
-  if (!sender_->Send(new SyncCompositorMsg_ZoomBy(
-          routing_id_, zoom_delta, anchor, &common_renderer_params))) {
-    return;
+  {
+    base::ThreadRestrictions::ScopedAllowWait wait;
+    if (!sender_->Send(new SyncCompositorMsg_ZoomBy(
+            routing_id_, zoom_delta, anchor, &common_renderer_params))) {
+      return;
+    }
   }
   ProcessCommonParams(common_renderer_params);
 }
 
 void SynchronousCompositorHost::OnComputeScroll(
     base::TimeTicks animation_time) {
   if (!need_animate_scroll_)
     return;
   need_animate_scroll_ = false;
 
@@ skipping 52 matching lines @@
   if (params.page_scale_factor) {
     client_->UpdateRootLayerState(
         this, gfx::ScrollOffsetToVector2dF(params.total_scroll_offset),
         gfx::ScrollOffsetToVector2dF(params.max_scroll_offset),
         params.scrollable_size, params.page_scale_factor,
         params.min_page_scale_factor, params.max_page_scale_factor);
   }
 }
 
 }  // namespace content