Unit Test for WebView animating in and out of screen

android_webview/browser/test/fake_window.cc

 // Copyright 2014 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/test/fake_window.h"
 
 #include "android_webview/browser/browser_view_renderer.h"
-#include "android_webview/public/browser/draw_gl.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace android_webview {
 
 class FakeWindow::ScopedMakeCurrent {
  public:
   ScopedMakeCurrent(FakeWindow* view_root) : view_root_(view_root) {
@@ skipping 93 matching lines @@
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(&FakeWindow::OnDrawHardware, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void FakeWindow::OnDrawHardware() {
   CheckCurrentlyOnUIThread();
   DCHECK(on_draw_hardware_pending_);
   on_draw_hardware_pending_ = false;
 
+  view_->PrepareToDraw(gfx::Vector2d(), location_);
   hooks_->WillOnDraw();
-  view_->PrepareToDraw(gfx::Vector2d(), location_);
   bool success = view_->OnDrawHardware();
   hooks_->DidOnDraw(success);
   if (success) {
     CreateRenderThreadIfNeeded();
 
     base::WaitableEvent completion(true, false);
     render_thread_loop_->PostTask(
         FROM_HERE, base::Bind(&FakeWindow::DrawFunctorOnRT,
                               base::Unretained(this), &completion));
     completion.Wait();
   }
 }
 
 void FakeWindow::DrawFunctorOnRT(base::WaitableEvent* sync) {
   CheckCurrentlyOnRT();
   // Ok to access UI functions until sync is signalled.
   gfx::Rect location = location_;
   {
     AwDrawGLInfo process_info;
     process_info.version = kAwDrawGLInfoVersion;
     process_info.mode = AwDrawGLInfo::kModeSync;
 
     hooks_->WillSyncOnRT(functor_);
     functor_->DrawGL(&process_info);
     hooks_->DidSyncOnRT(functor_);
   }
-  sync->Signal();
+
+  if (!hooks_->WillWaitForModeDrawToFinish()) {
+    sync->Signal();
+  }
 
   AwDrawGLInfo draw_info;
   draw_info.version = kAwDrawGLInfoVersion;
   draw_info.mode = AwDrawGLInfo::kModeDraw;
   draw_info.clip_left = location.x();
   draw_info.clip_top = location.y();
   draw_info.clip_right = location.x() + location.width();
   draw_info.clip_bottom = location.y() + location.height();
-  draw_info.width = surface_size_.width();
-  draw_info.height = surface_size_.height();
-  draw_info.is_layer = false;
 
-  draw_info.transform[0] = 1.0;
-  draw_info.transform[1] = 0.0;
-  draw_info.transform[2] = 0.0;
-  draw_info.transform[3] = 0.0;
+  hooks_->SetParentDrawConstraints(draw_info);
 
-  draw_info.transform[4] = 0.0;
-  draw_info.transform[5] = 1.0;
-  draw_info.transform[6] = 0.0;
-  draw_info.transform[7] = 0.0;
+  if (!hooks_->WillDrawOnRT(functor_)) {
+    if (hooks_->WillWaitForModeDrawToFinish()) {

[boliu, 2015/03/13 23:51:55]

Save the value from above. Don't call it twice.

Maybe we need a scoped thingy here..

[hush (inactive), 2015/03/16 18:19:21]

I put it as a private member in the class.

+      sync->Signal();
+    }
+    return;
+  }
 
-  draw_info.transform[8] = 0.0;
-  draw_info.transform[9] = 0.0;
-  draw_info.transform[10] = 1.0;
-  draw_info.transform[11] = 0.0;
-
-  draw_info.transform[12] = 0.0;
-  draw_info.transform[13] = 0.0;
-  draw_info.transform[14] = 0.0;
-  draw_info.transform[15] = 1.0;
-
-  hooks_->WillDrawOnRT(functor_);
   {
     ScopedMakeCurrent make_current(this);
     functor_->DrawGL(&draw_info);
   }
   hooks_->DidDrawOnRT(functor_);
+  if (hooks_->WillWaitForModeDrawToFinish()) {

[boliu, 2015/03/13 23:51:55]

ditto

[hush (inactive), 2015/03/16 18:19:21]

Done.

+    sync->Signal();
+  }
 }
 
 void FakeWindow::CheckCurrentlyOnUIThread() {
   DCHECK(ui_checker_.CalledOnValidSequencedThread());
 }
 
 void FakeWindow::CreateRenderThreadIfNeeded() {
   CheckCurrentlyOnUIThread();
   if (functor_) {
     DCHECK(render_thread_.get());
@@ skipping 32 matching lines @@
     surface_ = nullptr;
   }
   sync->Signal();
 }
 
 void FakeWindow::CheckCurrentlyOnRT() {
   DCHECK(rt_checker_.CalledOnValidSequencedThread());
 }
 
 }  // namespace android_webview