summaryrefslogtreecommitdiffstats
path: root/cc/output/software_renderer.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 05:55:58 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 05:55:58 +0000
commitf0a752882d6b01c4f185fc0d28a5831006e3134b (patch)
tree6282833744e70e26ea36ad64ad2675763f1debc9 /cc/output/software_renderer.cc
parentf394b44314dc3177174bca62a018d5a2f6426a10 (diff)
downloadchromium_src-f0a752882d6b01c4f185fc0d28a5831006e3134b.zip
chromium_src-f0a752882d6b01c4f185fc0d28a5831006e3134b.tar.gz
chromium_src-f0a752882d6b01c4f185fc0d28a5831006e3134b.tar.bz2
cc: Make impl-side painting work with software renderer.
This adds support for software backed resources to the MapImage API and fixes a problem in the pixel buffer implementation that prevented software resources from working correctly. This also removes the unused ResourceProvider::SetPixelsFromBuffer function. BUG=248105 TEST=chrome --ui-enable-software-compositing --enable-software-compositing-gl-adapter --enable-compositor-frame-message --disable-accelerated-2d-canvas --force-compositing-mode --enable-threaded-compositing --allow-webui-compositing --enable-impl-side-painting --use-map-image Review URL: https://chromiumcodereview.appspot.com/18266003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/software_renderer.cc')
-rw-r--r--cc/output/software_renderer.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 2da959f..e7273a8 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -75,9 +75,7 @@ SoftwareRenderer::SoftwareRenderer(RendererClient* client,
capabilities_.allow_partial_texture_updates = true;
capabilities_.using_partial_swap = true;
- capabilities_.using_map_image =
- Settings().use_map_image &&
- output_surface->capabilities().deferred_gl_initialization;
+ capabilities_.using_map_image = Settings().use_map_image;
}
SoftwareRenderer::~SoftwareRenderer() {}