summaryrefslogtreecommitdiff
path: root/chromium/cc/resources/tile_manager.h
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org>2014-02-11 01:56:37 +0000
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-06-13 17:09:37 +0200
commit66ec79d38fe3a0958ace8c131df64c1c9e0dc3ec (patch)
treeba8a6eb0ecef688ec0d2c99db4e38c77d7f0ad30 /chromium/cc/resources/tile_manager.h
parenta95f019bf395b7fbd21299652d4aaf2f4d233dec (diff)
downloadqtwebengine-chromium-33.0.1750.149-based.tar.gz
[Backport] cc: Prevent usage of rasterize on-demand with delegating renderer.33.0.1750.149-based
PictureDrawQuads are not yet supported by the delegating renderer. Generating this type of quads for on-demand raster of tiles cause invalid IPC to be sent to the parent compositor and the renderer to be killed. This makes us activate with low-res or checkerboard tiles until PictureDrawQuads are properly supported by the delegating renderer. BUG=340695 TEST=cc_unittests --gtest_filter=*RasterizeOnDemand* Review URL: https://codereview.chromium.org/157743007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250273 0039d316-1c4b-4281-b951-d872f2087c98 Conflicts: cc/resources/tile_manager.cc Change-Id: I9a08cc770d97d297c71dec88f3fdb878208d21ac Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/cc/resources/tile_manager.h')
-rw-r--r--chromium/cc/resources/tile_manager.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/cc/resources/tile_manager.h b/chromium/cc/resources/tile_manager.h
index 78beb1b15fb..9c7a98dc338 100644
--- a/chromium/cc/resources/tile_manager.h
+++ b/chromium/cc/resources/tile_manager.h
@@ -55,6 +55,7 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
size_t num_raster_threads,
RenderingStatsInstrumentation* rendering_stats_instrumentation,
bool use_map_image,
+ bool use_rasterize_on_demand,
size_t max_transfer_buffer_usage_bytes,
size_t max_raster_usage_bytes,
GLenum map_image_texture_target);
@@ -122,7 +123,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
scoped_ptr<RasterWorkerPool> raster_worker_pool,
size_t num_raster_threads,
size_t max_raster_usage_bytes,
- RenderingStatsInstrumentation* rendering_stats_instrumentation);
+ RenderingStatsInstrumentation* rendering_stats_instrumentation,
+ bool use_rasterize_on_demand);
// Methods called by Tile
friend class Tile;
@@ -217,6 +219,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
std::vector<Tile*> released_tiles_;
+ bool use_rasterize_on_demand_;
+
DISALLOW_COPY_AND_ASSIGN(TileManager);
};