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

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

Issue 2686243002: content/ui[Android]: Remove ContextProviderFactory. (Closed)
Patch Set: more rebase Created 3 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 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 21 matching lines...) Expand all
32 #include "content/public/test/test_browser_thread_bundle.h" 32 #include "content/public/test/test_browser_thread_bundle.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/base_event_utils.h" 36 #include "ui/events/base_event_utils.h"
37 #include "ui/events/blink/web_input_event_traits.h" 37 #include "ui/events/blink/web_input_event_traits.h"
38 #include "ui/events/keycodes/keyboard_codes.h" 38 #include "ui/events/keycodes/keyboard_codes.h"
39 #include "ui/gfx/canvas.h" 39 #include "ui/gfx/canvas.h"
40 40
41 #if defined(OS_ANDROID) 41 #if defined(OS_ANDROID)
42 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
43 #include "content/browser/renderer_host/render_widget_host_view_android.h" 42 #include "content/browser/renderer_host/render_widget_host_view_android.h"
44 #include "content/test/mock_gpu_channel_establish_factory.h"
45 #include "ui/android/screen_android.h" 43 #include "ui/android/screen_android.h"
46 #endif 44 #endif
47 45
48 #if defined(USE_AURA) || defined(OS_MACOSX) 46 #if defined(USE_AURA) || defined(OS_MACOSX)
49 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 47 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
50 #endif 48 #endif
51 49
52 #if defined(USE_AURA) 50 #if defined(USE_AURA)
53 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 51 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
54 #include "content/browser/renderer_host/ui_events_helper.h" 52 #include "content/browser/renderer_host/ui_events_helper.h"
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 467
470 browser_context_.reset(new TestBrowserContext()); 468 browser_context_.reset(new TestBrowserContext());
471 delegate_.reset(new MockRenderWidgetHostDelegate()); 469 delegate_.reset(new MockRenderWidgetHostDelegate());
472 process_ = new RenderWidgetHostProcess(browser_context_.get()); 470 process_ = new RenderWidgetHostProcess(browser_context_.get());
473 #if defined(USE_AURA) || defined(OS_MACOSX) 471 #if defined(USE_AURA) || defined(OS_MACOSX)
474 ImageTransportFactory::InitializeForUnitTests( 472 ImageTransportFactory::InitializeForUnitTests(
475 std::unique_ptr<ImageTransportFactory>( 473 std::unique_ptr<ImageTransportFactory>(
476 new NoTransportImageTransportFactory)); 474 new NoTransportImageTransportFactory));
477 #endif 475 #endif
478 #if defined(OS_ANDROID) 476 #if defined(OS_ANDROID)
479 ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
480 ui::ContextProviderFactory::SetInstance(
481 ContextProviderFactoryImpl::GetInstance());
482 ui::SetScreenAndroid(); // calls display::Screen::SetScreenInstance(). 477 ui::SetScreenAndroid(); // calls display::Screen::SetScreenInstance().
483 #endif 478 #endif
484 #if defined(USE_AURA) 479 #if defined(USE_AURA)
485 screen_.reset(aura::TestScreen::Create(gfx::Size())); 480 screen_.reset(aura::TestScreen::Create(gfx::Size()));
486 display::Screen::SetScreenInstance(screen_.get()); 481 display::Screen::SetScreenInstance(screen_.get());
487 #endif 482 #endif
488 host_.reset(new MockRenderWidgetHost(delegate_.get(), process_, 483 host_.reset(new MockRenderWidgetHost(delegate_.get(), process_,
489 process_->GetNextRoutingID())); 484 process_->GetNextRoutingID()));
490 view_.reset(new TestView(host_.get())); 485 view_.reset(new TestView(host_.get()));
491 ConfigureView(view_.get()); 486 ConfigureView(view_.get());
(...skipping 12 matching lines...) Expand all
504 499
505 #if defined(USE_AURA) 500 #if defined(USE_AURA)
506 display::Screen::SetScreenInstance(nullptr); 501 display::Screen::SetScreenInstance(nullptr);
507 screen_.reset(); 502 screen_.reset();
508 #endif 503 #endif
509 #if defined(USE_AURA) || defined(OS_MACOSX) 504 #if defined(USE_AURA) || defined(OS_MACOSX)
510 ImageTransportFactory::Terminate(); 505 ImageTransportFactory::Terminate();
511 #endif 506 #endif
512 #if defined(OS_ANDROID) 507 #if defined(OS_ANDROID)
513 display::Screen::SetScreenInstance(nullptr); 508 display::Screen::SetScreenInstance(nullptr);
514 ui::ContextProviderFactory::SetInstance(nullptr);
515 ContextProviderFactoryImpl::Terminate();
516 #endif 509 #endif
517 510
518 // Process all pending tasks to avoid leaks. 511 // Process all pending tasks to avoid leaks.
519 base::RunLoop().RunUntilIdle(); 512 base::RunLoop().RunUntilIdle();
520 } 513 }
521 514
522 void SetInitialRenderSizeParams() { 515 void SetInitialRenderSizeParams() {
523 ResizeParams render_size_params; 516 ResizeParams render_size_params;
524 host_->GetResizeParams(&render_size_params); 517 host_->GetResizeParams(&render_size_params);
525 host_->SetInitialRenderSizeParams(render_size_params); 518 host_->SetInitialRenderSizeParams(render_size_params);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 RenderWidgetHostProcess* process_; // Deleted automatically by the widget. 649 RenderWidgetHostProcess* process_; // Deleted automatically by the widget.
657 std::unique_ptr<MockRenderWidgetHostDelegate> delegate_; 650 std::unique_ptr<MockRenderWidgetHostDelegate> delegate_;
658 std::unique_ptr<MockRenderWidgetHost> host_; 651 std::unique_ptr<MockRenderWidgetHost> host_;
659 std::unique_ptr<TestView> view_; 652 std::unique_ptr<TestView> view_;
660 std::unique_ptr<display::Screen> screen_; 653 std::unique_ptr<display::Screen> screen_;
661 bool handle_key_press_event_; 654 bool handle_key_press_event_;
662 bool handle_mouse_event_; 655 bool handle_mouse_event_;
663 double last_simulated_event_time_seconds_; 656 double last_simulated_event_time_seconds_;
664 double simulated_event_time_delta_seconds_; 657 double simulated_event_time_delta_seconds_;
665 658
666 #if defined(OS_ANDROID)
667 MockGpuChannelEstablishFactory gpu_channel_factory_;
668 #endif
669
670 private: 659 private:
671 SyntheticWebTouchEvent touch_event_; 660 SyntheticWebTouchEvent touch_event_;
672 661
673 TestBrowserThreadBundle thread_bundle_; 662 TestBrowserThreadBundle thread_bundle_;
674 663
675 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostTest); 664 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostTest);
676 }; 665 };
677 666
678 #if GTEST_HAS_PARAM_TEST 667 #if GTEST_HAS_PARAM_TEST
679 // RenderWidgetHostWithSourceTest ---------------------------------------------- 668 // RenderWidgetHostWithSourceTest ----------------------------------------------
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 ui::LatencyInfo()); 1732 ui::LatencyInfo());
1744 1733
1745 1734
1746 // Tests RWHI::ForwardWheelEventWithLatencyInfo(). 1735 // Tests RWHI::ForwardWheelEventWithLatencyInfo().
1747 SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo()); 1736 SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
1748 1737
1749 ASSERT_FALSE(host_->input_router()->HasPendingEvents()); 1738 ASSERT_FALSE(host_->input_router()->HasPendingEvents());
1750 } 1739 }
1751 1740
1752 } // namespace content 1741 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698