summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-27 00:44:28 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-27 00:44:28 +0000
commit6b16679e5700658051a581bb61b37e5b542ef818 (patch)
tree9e9ed110b8a2685391959a77614f9fc18b4afe5f /webkit
parented6635eb5d07d0ad27a2a02ffeacf87c135090fe (diff)
downloadchromium_src-6b16679e5700658051a581bb61b37e5b542ef818.zip
chromium_src-6b16679e5700658051a581bb61b37e5b542ef818.tar.gz
chromium_src-6b16679e5700658051a581bb61b37e5b542ef818.tar.bz2
Aura: Resize locks with --ui-enable-threaded-compositing
We temporarily defer commits while resizing so that the renderer has a chance to catch up with the UI window size. Noteable changes from master: - RWHVs can fast ACK the GPU process (not flip in the browser or TextureImageTransportSurface); useful for allowing the renderer to catch up when it gets too far behind. - RWHVA will insist kicking a renderer frame after the lock times out on resize (wasn't necessary before) - ui::Compositor vends draw locks (which largely just wraps to cc::Proxy) of ui::aura::RootWindow BUG=136366 TEST=None Review URL: https://chromiumcodereview.appspot.com/10690168 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/compositor_bindings/web_layer_tree_view_impl.cc5
-rw-r--r--webkit/compositor_bindings/web_layer_tree_view_impl.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
index e61a166..d1a453e 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -165,6 +165,11 @@ void WebLayerTreeViewImpl::finishAllRendering()
m_layerTreeHost->finishAllRendering();
}
+void WebLayerTreeViewImpl::setDeferCommits(bool deferCommits)
+{
+ m_layerTreeHost->setDeferCommits(deferCommits);
+}
+
void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
{
RenderingStats ccStats;
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h
index 9b0ecbf..dace36c 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.h
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h
@@ -46,6 +46,7 @@ public:
virtual void updateAnimations(double frameBeginTime) OVERRIDE;
virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;
virtual void finishAllRendering() OVERRIDE;
+ virtual void setDeferCommits(bool deferCommits) OVERRIDE;
virtual void renderingStats(WebRenderingStats&) const OVERRIDE;
virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight) OVERRIDE;
virtual void loseCompositorContext(int numTimes) OVERRIDE;