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

Side by Side Diff: android_webview/browser/test/rendering_test.cc

Issue 2263043002: android_webview: Let AwContents manage TouchHandleDrawable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/test/rendering_test.h" 5 #include "android_webview/browser/test/rendering_test.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/browser_view_renderer.h" 9 #include "android_webview/browser/browser_view_renderer.h"
10 #include "android_webview/browser/child_frame.h" 10 #include "android_webview/browser/child_frame.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) { 45 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
46 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); 46 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
47 } 47 }
48 48
49 RenderingTest::~RenderingTest() { 49 RenderingTest::~RenderingTest() {
50 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 50 DCHECK(ui_task_runner_->BelongsToCurrentThread());
51 if (window_.get()) 51 if (window_.get())
52 window_->Detach(); 52 window_->Detach();
53 } 53 }
54 54
55 ui::TouchHandleDrawable* RenderingTest::CreateDrawable() {
56 return nullptr;
57 }
58
55 void RenderingTest::SetUpTestHarness() { 59 void RenderingTest::SetUpTestHarness() {
56 DCHECK(!browser_view_renderer_.get()); 60 DCHECK(!browser_view_renderer_.get());
57 DCHECK(!functor_.get()); 61 DCHECK(!functor_.get());
58 browser_view_renderer_.reset( 62 browser_view_renderer_.reset(
59 new TestBrowserViewRenderer(this, base::ThreadTaskRunnerHandle::Get())); 63 new TestBrowserViewRenderer(this, base::ThreadTaskRunnerHandle::Get()));
60 browser_view_renderer_->SetActiveCompositorID(CompositorID(0, 0)); 64 browser_view_renderer_->SetActiveCompositorID(CompositorID(0, 0));
61 InitializeCompositor(); 65 InitializeCompositor();
62 std::unique_ptr<FakeWindow> window( 66 std::unique_ptr<FakeWindow> window(
63 new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100))); 67 new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
64 functor_.reset(new FakeFunctor); 68 functor_.reset(new FakeFunctor);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 void RenderingTest::PostInvalidate() { 161 void RenderingTest::PostInvalidate() {
158 if (window_) 162 if (window_)
159 window_->PostInvalidate(); 163 window_->PostInvalidate();
160 } 164 }
161 165
162 gfx::Point RenderingTest::GetLocationOnScreen() { 166 gfx::Point RenderingTest::GetLocationOnScreen() {
163 return gfx::Point(); 167 return gfx::Point();
164 } 168 }
165 169
166 } // namespace android_webview 170 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/test/rendering_test.h ('k') | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698