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

Side by Side Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 2190033002: content: Add ContextProviderFactory to create a render ContextProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove display_ DCHECK. Created 4 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <tuple> 9 #include <tuple>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "content/public/common/content_switches.h" 30 #include "content/public/common/content_switches.h"
31 #include "content/public/test/mock_render_process_host.h" 31 #include "content/public/test/mock_render_process_host.h"
32 #include "content/public/test/test_browser_context.h" 32 #include "content/public/test/test_browser_context.h"
33 #include "content/test/test_render_view_host.h" 33 #include "content/test/test_render_view_host.h"
34 #include "testing/gtest/include/gtest/gtest.h" 34 #include "testing/gtest/include/gtest/gtest.h"
35 #include "ui/display/screen.h" 35 #include "ui/display/screen.h"
36 #include "ui/events/keycodes/keyboard_codes.h" 36 #include "ui/events/keycodes/keyboard_codes.h"
37 #include "ui/gfx/canvas.h" 37 #include "ui/gfx/canvas.h"
38 38
39 #if defined(OS_ANDROID) 39 #if defined(OS_ANDROID)
40 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
40 #include "content/browser/renderer_host/render_widget_host_view_android.h" 41 #include "content/browser/renderer_host/render_widget_host_view_android.h"
41 #endif 42 #endif
42 43
43 #if defined(USE_AURA) || defined(OS_MACOSX) 44 #if defined(USE_AURA) || defined(OS_MACOSX)
44 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 45 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
45 #endif 46 #endif
46 47
47 #if defined(USE_AURA) 48 #if defined(USE_AURA)
48 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 49 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
49 #include "content/browser/renderer_host/ui_events_helper.h" 50 #include "content/browser/renderer_host/ui_events_helper.h"
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 command_line->AppendSwitch(switches::kValidateInputEventStream); 460 command_line->AppendSwitch(switches::kValidateInputEventStream);
460 461
461 browser_context_.reset(new TestBrowserContext()); 462 browser_context_.reset(new TestBrowserContext());
462 delegate_.reset(new MockRenderWidgetHostDelegate()); 463 delegate_.reset(new MockRenderWidgetHostDelegate());
463 process_ = new RenderWidgetHostProcess(browser_context_.get()); 464 process_ = new RenderWidgetHostProcess(browser_context_.get());
464 #if defined(USE_AURA) || defined(OS_MACOSX) 465 #if defined(USE_AURA) || defined(OS_MACOSX)
465 ImageTransportFactory::InitializeForUnitTests( 466 ImageTransportFactory::InitializeForUnitTests(
466 std::unique_ptr<ImageTransportFactory>( 467 std::unique_ptr<ImageTransportFactory>(
467 new NoTransportImageTransportFactory)); 468 new NoTransportImageTransportFactory));
468 #endif 469 #endif
470 #if defined(OS_ANDROID)
471 ui::ContextProviderFactory::SetInstance(
472 ContextProviderFactoryImpl::GetInstance());
473 #endif
469 #if defined(USE_AURA) 474 #if defined(USE_AURA)
470 screen_.reset(aura::TestScreen::Create(gfx::Size())); 475 screen_.reset(aura::TestScreen::Create(gfx::Size()));
471 display::Screen::SetScreenInstance(screen_.get()); 476 display::Screen::SetScreenInstance(screen_.get());
472 #endif 477 #endif
473 host_.reset(new MockRenderWidgetHost(delegate_.get(), process_, 478 host_.reset(new MockRenderWidgetHost(delegate_.get(), process_,
474 process_->GetNextRoutingID())); 479 process_->GetNextRoutingID()));
475 view_.reset(new TestView(host_.get())); 480 view_.reset(new TestView(host_.get()));
476 ConfigureView(view_.get()); 481 ConfigureView(view_.get());
477 host_->SetView(view_.get()); 482 host_->SetView(view_.get());
478 SetInitialRenderSizeParams(); 483 SetInitialRenderSizeParams();
479 host_->Init(); 484 host_->Init();
480 host_->DisableGestureDebounce(); 485 host_->DisableGestureDebounce();
481 } 486 }
482 487
483 void TearDown() override { 488 void TearDown() override {
484 view_.reset(); 489 view_.reset();
485 host_.reset(); 490 host_.reset();
486 delegate_.reset(); 491 delegate_.reset();
487 process_ = NULL; 492 process_ = NULL;
488 browser_context_.reset(); 493 browser_context_.reset();
489 494
490 #if defined(USE_AURA) 495 #if defined(USE_AURA)
491 display::Screen::SetScreenInstance(nullptr); 496 display::Screen::SetScreenInstance(nullptr);
492 screen_.reset(); 497 screen_.reset();
493 #endif 498 #endif
494 #if defined(USE_AURA) || defined(OS_MACOSX) 499 #if defined(USE_AURA) || defined(OS_MACOSX)
495 ImageTransportFactory::Terminate(); 500 ImageTransportFactory::Terminate();
496 #endif 501 #endif
502 #if defined(OS_ANDROID)
503 ui::ContextProviderFactory::SetInstance(nullptr);
504 #endif
497 505
498 // Process all pending tasks to avoid leaks. 506 // Process all pending tasks to avoid leaks.
499 base::RunLoop().RunUntilIdle(); 507 base::RunLoop().RunUntilIdle();
500 } 508 }
501 509
502 void SetInitialRenderSizeParams() { 510 void SetInitialRenderSizeParams() {
503 ResizeParams render_size_params; 511 ResizeParams render_size_params;
504 host_->GetResizeParams(&render_size_params); 512 host_->GetResizeParams(&render_size_params);
505 host_->SetInitialRenderSizeParams(render_size_params); 513 host_->SetInitialRenderSizeParams(render_size_params);
506 } 514 }
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1688 ui::LatencyInfo()); 1696 ui::LatencyInfo());
1689 1697
1690 1698
1691 // Tests RWHI::ForwardWheelEventWithLatencyInfo(). 1699 // Tests RWHI::ForwardWheelEventWithLatencyInfo().
1692 SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo()); 1700 SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
1693 1701
1694 ASSERT_FALSE(host_->input_router()->HasPendingEvents()); 1702 ASSERT_FALSE(host_->input_router()->HasPendingEvents());
1695 } 1703 }
1696 1704
1697 } // namespace content 1705 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698