Commit 1e4c352b authored by enne@chromium.org's avatar enne@chromium.org

cc: Prohibit impl-side painting with single threaded compositing

Just a little cleanup and some extra checks.

R=danakj@chromium.org
BUG=155209


Review URL: https://chromiumcodereview.appspot.com/11827036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175981 0039d316-1c4b-4281-b951-d872f2087c98
parent d0040c2a
...@@ -29,6 +29,10 @@ SingleThreadProxy::SingleThreadProxy(LayerTreeHost* layerTreeHost) ...@@ -29,6 +29,10 @@ SingleThreadProxy::SingleThreadProxy(LayerTreeHost* layerTreeHost)
{ {
TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy"); TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
DCHECK(Proxy::isMainThread()); DCHECK(Proxy::isMainThread());
DCHECK(layerTreeHost);
// Impl-side painting not supported without threaded compositing
DCHECK(!layerTreeHost->settings().implSidePainting);
} }
void SingleThreadProxy::start() void SingleThreadProxy::start()
...@@ -361,9 +365,6 @@ bool SingleThreadProxy::doComposite() ...@@ -361,9 +365,6 @@ bool SingleThreadProxy::doComposite()
m_layerTreeHostImpl->animate(base::TimeTicks::Now(), base::Time::Now()); m_layerTreeHostImpl->animate(base::TimeTicks::Now(), base::Time::Now());
if (m_layerTreeHostImpl->settings().implSidePainting)
m_layerTreeHostImpl->manageTiles();
// We guard prepareToDraw() with canDraw() because it always returns a valid frame, so can only // We guard prepareToDraw() with canDraw() because it always returns a valid frame, so can only
// be used when such a frame is possible. Since drawLayers() depends on the result of // be used when such a frame is possible. Since drawLayers() depends on the result of
// prepareToDraw(), it is guarded on canDraw() as well. // prepareToDraw(), it is guarded on canDraw() as well.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment