Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: android_webview/browser/test/fake_window.cc

Issue 1002013003: Unit Test for WebView animating in and out of screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/test/fake_window.h ('k') | android_webview/browser/test/rendering_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/test/fake_window.cc
diff --git a/android_webview/browser/test/fake_window.cc b/android_webview/browser/test/fake_window.cc
index 0a0956bab3a5316b7ea9e169edfae55ee7bdfad1..0f8b62622b6d3f9d84301a3fb2346922d93463b2 100644
--- a/android_webview/browser/test/fake_window.cc
+++ b/android_webview/browser/test/fake_window.cc
@@ -5,7 +5,6 @@
#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"
@@ -106,8 +105,12 @@ void FakeWindow::ProcessFunctorOnRT(base::WaitableEvent* sync) {
void FakeWindow::PostInvalidate() {
CheckCurrentlyOnUIThread();
- if (on_draw_hardware_pending_)
+ if (on_draw_hardware_pending_) {
+ base::MessageLoopProxy::current()->PostTask(
hush (inactive) 2015/03/17 18:38:18 I need this postTask so that the onDraws won't be
+ FROM_HERE, base::Bind(&FakeWindow::PostInvalidate,
+ weak_ptr_factory_.GetWeakPtr()));
return;
+ }
on_draw_hardware_pending_ = true;
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
@@ -119,8 +122,8 @@ void FakeWindow::OnDrawHardware() {
DCHECK(on_draw_hardware_pending_);
on_draw_hardware_pending_ = false;
- hooks_->WillOnDraw();
view_->PrepareToDraw(gfx::Vector2d(), location_);
+ hooks_->WillOnDraw();
bool success = view_->OnDrawHardware();
hooks_->DidOnDraw(success);
if (success) {
@@ -156,31 +159,10 @@ void FakeWindow::DrawFunctorOnRT(base::WaitableEvent* sync) {
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;
-
- draw_info.transform[4] = 0.0;
- draw_info.transform[5] = 1.0;
- draw_info.transform[6] = 0.0;
- draw_info.transform[7] = 0.0;
-
- 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_);
+
+ if (!hooks_->WillDrawOnRT(functor_, draw_info))
+ return;
+
{
ScopedMakeCurrent make_current(this);
functor_->DrawGL(&draw_info);
« no previous file with comments | « android_webview/browser/test/fake_window.h ('k') | android_webview/browser/test/rendering_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698