|
Revert 216780 "Clean up compositor initialization/destruction."
> Clean up compositor initialization/destruction.
>
> Moved from https://codereview.chromium.org/21052007/
>
> Currently the ContextFactory is outliving the compositor thread in
> tests, which is bad since the contexts in there can be bound to the
> compositor thread. Then we end up reusing those contexts and bad
> things happen.
>
> This enforces ordering for initializing and destroying the
> compositor as follows:
>
> Initialize ContextFactory
> ..Compositor::Initialize
> ....Create Compositor instances
> ....Delete Compositor instances
> ..Compositor::Terminate
>
> The Compositor::Terminate call also destroys the ContextFactory.
>
> The ContextFactory can be initialized in one of two ways:
> 1. ImageTransportFactory::Initialize will set up the
> ContextFactory. This is used by things that invoke all of
> content/browser/.
> 2. Compositor::InitializeContextFactoryForTests() must be
> explicitly called by any unit tests that create a compositor.
>
> Since some tests want a real GL context and some don't, this
> does away with the misnomer of initializing the Compositor once
> for the entire test suite, and then re-initializing somewhere
> in the middle of the test suite. Instead, each test must
> Initialize/Terminate the compositor with the ContextFactory
> type of its choice.
>
> Incidently, this test enables 20 tests on aura or win_aura that
> were previously being skipped.
>
> TBR=piman@chromium.org
> BUG= 258625
>
> Review URL: https://chromiumcodereview.appspot.com/22293003
TBR=danakj@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216907
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+373 lines, -404 lines) |
Patch |
 |
M |
trunk/src/ash/test/test_shell_delegate.cc
|
View
|
|
2 chunks |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ash/test/test_suite.cc
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
|
View
|
|
2 chunks |
+12 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/extensions/requirements_checker_browsertest.cc
|
View
|
|
3 chunks |
+12 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/extensions/web_view_browsertest.cc
|
View
|
|
3 chunks |
+11 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/prerender/prerender_browsertest.cc
|
View
|
|
2 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/ui/ash/ash_init.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h
|
View
|
|
2 chunks |
+1 line, -3 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
|
View
|
|
1 chunk |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/base/in_process_browser_test.cc
|
View
|
|
4 chunks |
+15 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/base/test_launcher_utils.h
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/base/test_launcher_utils.cc
|
View
|
|
2 chunks |
+11 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/base/view_event_test_base.cc
|
View
|
|
3 chunks |
+4 lines, -13 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/gpu/gpu_feature_browsertest.cc
|
View
|
|
9 chunks |
+22 lines, -13 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/gpu/webgl_infobar_browsertest.cc
|
View
|
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/ppapi/ppapi_test.cc
|
View
|
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/test/ui/ui_test.cc
|
View
|
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/components/test/run_all_unittests.cc
|
View
|
|
2 chunks |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/aura/gpu_process_transport_factory.h
|
View
|
|
2 chunks |
+1 line, -4 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/aura/gpu_process_transport_factory.cc
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/aura/image_transport_factory.cc
|
View
|
|
1 chunk |
+8 lines, -30 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/gpu/gpu_info_browsertest.cc
|
View
|
|
2 chunks |
+4 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/gpu/gpu_ipc_browsertests.cc
|
View
|
|
1 chunk |
+12 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/gpu/gpu_pixel_browsertest.cc
|
View
|
|
3 chunks |
+3 lines, -7 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/media_browsertest.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/media_browsertest.cc
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/renderer_host/render_widget_host_view_browsertest.cc
|
View
|
|
7 chunks |
+46 lines, -13 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
View
|
|
4 chunks |
+7 lines, -5 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/content/common/gpu/client/gl_helper.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
trunk/src/content/common/gpu/client/gl_helper.cc
|
View
|
|
9 chunks |
+9 lines, -20 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/content/public/test/browser_test_base.h
|
View
|
|
2 chunks |
+0 lines, -16 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/content/public/test/browser_test_base.cc
|
View
|
|
4 chunks |
+1 line, -54 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/content/public/test/content_test_suite_base.cc
|
View
|
|
2 chunks |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/aura/test/aura_test_helper.cc
|
View
|
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/aura/test/test_suite.cc
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/compositor/compositor.h
|
View
|
|
4 chunks |
+0 lines, -14 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/compositor/compositor.cc
|
View
|
|
11 chunks |
+53 lines, -65 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/compositor/compositor.gyp
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/ui/compositor/compositor_setup.h
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/compositor/layer_unittest.cc
|
View
|
|
18 chunks |
+73 lines, -59 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/compositor/test/test_suite.cc
|
View
|
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/keyboard/keyboard_test_suite.cc
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/message_center/test/run_all_unittests.cc
|
View
|
|
2 chunks |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/snapshot/snapshot_aura_unittest.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/views/run_all_unittests.cc
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
trunk/src/ui/views/widget/desktop_aura/desktop_capture_client_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|