diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 07:09:18 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 07:09:18 +0000 |
| commit | c3d887269087956cada3c0d6fc17c6fc2ec7fbf4 (patch) | |
| tree | dd2cbe73db028200ad76476431b083dde2b37209 /cc/base | |
| parent | 0b5c093b1c139d66a8b69d9600397da49c85a76f (diff) | |
| download | chromium_src-c3d887269087956cada3c0d6fc17c6fc2ec7fbf4.zip chromium_src-c3d887269087956cada3c0d6fc17c6fc2ec7fbf4.tar.gz chromium_src-c3d887269087956cada3c0d6fc17c6fc2ec7fbf4.tar.bz2 | |
Revert of Remove --enable-per-tile-painting and --ui-enable-per-tile-painting. (https://codereview.chromium.org/164183012/)
Reason for revert:
Breaks compositor_unittests on ChromeOS.
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/39630
LayerWithRealCompositorTest.Delegate (run #1):
[ RUN ] LayerWithRealCompositorTest.Delegate
../../ui/compositor/layer_unittest.cc:527: Failure
Value of: l1->bounds().size()
Actual: 8-byte object \u003C90-01 00-00 90-01 00-00>
Expected: delegate.paint_size()
Which is: 8-byte object \u003C00-00 00-00 00-00 00-00>
...
LayerWithRealCompositorTest.NoScaleCanvas (run #1):
[ RUN ] LayerWithRealCompositorTest.NoScaleCanvas
../../ui/compositor/layer_unittest.cc:1311: Failure
Value of: l1_delegate.paint_size().ToString()
Actual: "0x0"
Expected: "280x360"
[ FAILED ] LayerWithRealCompositorTest.NoScaleCanvas (112 ms)
...
I can repro the failures on my dev box and revert this CL fixes the problem.
Original issue's description:
> Remove --enable-per-tile-painting and --ui-enable-per-tile-painting.
>
> The ui flag is always true on ChromeOS and off elsewhere. The other is
> never on and we're not planning to turn it on.
>
> R=piman
> BUG=
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251538
TBR=piman@chromium.org,danakj@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/168423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/base')
| -rw-r--r-- | cc/base/switches.cc | 3 | ||||
| -rw-r--r-- | cc/base/switches.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cc/base/switches.cc b/cc/base/switches.cc index 7820420d..7e45074 100644 --- a/cc/base/switches.cc +++ b/cc/base/switches.cc @@ -86,6 +86,9 @@ const char kEnablePartialSwap[] = "enable-partial-swap"; // Disable partial swap which is needed for some OpenGL drivers / emulators. const char kUIDisablePartialSwap[] = "ui-disable-partial-swap"; +const char kEnablePerTilePainting[] = "enable-per-tile-painting"; +const char kUIEnablePerTilePainting[] = "ui-enable-per-tile-painting"; + // Enables the GPU benchmarking extension const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking"; diff --git a/cc/base/switches.h b/cc/base/switches.h index 153b985..5821d18 100644 --- a/cc/base/switches.h +++ b/cc/base/switches.h @@ -45,6 +45,8 @@ CC_EXPORT extern const char kDisableCompositorTouchHitTesting[]; // Switches for both the renderer and ui compositors. CC_EXPORT extern const char kUIDisablePartialSwap[]; +CC_EXPORT extern const char kEnablePerTilePainting[]; +CC_EXPORT extern const char kUIEnablePerTilePainting[]; CC_EXPORT extern const char kEnableGpuBenchmarking[]; // Debug visualizations. |