diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
| commit | 27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7 (patch) | |
| tree | 74954f5cb00293c37c51f30b822ebc067aa9e81e /cc/test/fake_tile_manager.cc | |
| parent | 16f2110ab00d1c05dc775b4a406e08525fb44c86 (diff) | |
| download | chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.zip chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.gz chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.bz2 | |
cc: Reland r233830. "Adding support for RGBA_4444 tile textures". r223830 had a bug in async_pixel_transfer_manager_egl.cc that wasn't directly related to the 4444 support. This patch includes the rest of the files in r223830. Changes to async_pixel_transfer_manager_egl.cc have been moved to the separate patch after fixing the bug: https://codereview.chromium.org/23533067/
BUG=272539
Review URL: https://chromiumcodereview.appspot.com/23447048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_tile_manager.cc')
| -rw-r--r-- | cc/test/fake_tile_manager.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc index 8b13c63..d8b53aa 100644 --- a/cc/test/fake_tile_manager.cc +++ b/cc/test/fake_tile_manager.cc @@ -32,7 +32,9 @@ class FakeRasterWorkerPool : public RasterWorkerPool { completed_tasks_.pop_front(); } } - virtual GLenum GetResourceFormat() const OVERRIDE { return GL_RGBA; } + virtual ResourceFormat GetResourceFormat() const OVERRIDE { + return RGBA_8888; + } virtual void OnRasterTasksFinished() OVERRIDE {} virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE {} |