|
Revert 107563 - Fix up compositor mocking.
Two changes:
a) detangle the mock compositor from compositor_test_support
a) pull in compositor when using a mock compositor
Rationale:
a) this target was meant to support using use_webkit_compositor=1 when WK isn't initialized; sometimes we will want to use the mock compositor when WK is initialized
b) we can imagine scenarios where we want to switch between mock and real compositors in the same executable, and it's one less target to update
BUG= 101477
TEST=bots stay green
Review URL: http://codereview.chromium.org/8395043
TBR=backer@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107564
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+51 lines, -97 lines) |
Patch |
 |
M |
chrome/chrome_tests.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/test/base/chrome_test_suite.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/content_plugin.gypi
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
M |
content/content_tests.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
content/test/content_test_suite.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ui/aura/aura.gyp
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
ui/aura/demo/demo_main.cc
|
View
|
|
3 chunks |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
ui/aura/test/test_suite.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
ui/aura_shell/aura_shell.gyp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ui/aura_shell/test_suite.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
ui/gfx/compositor/compositor.gyp
|
View
|
|
4 chunks |
+16 lines, -26 lines |
0 comments
|
Download
|
 |
M |
ui/gfx/compositor/compositor_test_support.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ui/gfx/compositor/compositor_test_support.cc
|
View
|
|
2 chunks |
+20 lines, -0 lines |
0 comments
|
Download
|
 |
D |
ui/gfx/test/gfx_test_utils.h
|
View
|
|
1 chunk |
+0 lines, -19 lines |
0 comments
|
Download
|
 |
D |
ui/gfx/test/gfx_test_utils.cc
|
View
|
|
1 chunk |
+0 lines, -24 lines |
0 comments
|
Download
|
 |
M |
views/run_all_unittests.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
views/views.gyp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|