diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 19:57:44 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 19:57:44 +0000 |
| commit | c5d374054723cf13199cf292f36bbc6c42c5b9c8 (patch) | |
| tree | 4ff3aa549aba2bc09e8a0de70b57a0757ddd4f52 /cc | |
| parent | 1479f7e52c6847cdeacdddb7ea698911718fa69f (diff) | |
| download | chromium_src-c5d374054723cf13199cf292f36bbc6c42c5b9c8.zip chromium_src-c5d374054723cf13199cf292f36bbc6c42c5b9c8.tar.gz chromium_src-c5d374054723cf13199cf292f36bbc6c42c5b9c8.tar.bz2 | |
WebKit revision 120360 changed chromium so that we don't need to have a layerTreeHost to add
an animation successfully. For now we are going back to old semantics because
it causes mapsGL pages to have some un-accelerated animations that hang as a
result.
The tradeoff of doing this patch is that we gain correctness for mapsGL page,
but we regress the fix in WebKit 120360 that fixed janky animations.
BUG=http://code.google.com/p/chromium/issues/detail?id=138213
Review URL: https://codereview.chromium.org/10911302
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/LayerChromium.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp index 2ecdbee..09d955e 100644 --- a/cc/LayerChromium.cpp +++ b/cc/LayerChromium.cpp @@ -638,6 +638,12 @@ void LayerChromium::setTransformFromAnimation(const WebTransformationMatrix& tra bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation) { + // WebCore currently assumes that accelerated animations will start soon + // after the animation is added. However we cannot guarantee that if we do + // not have a layerTreeHost that will setNeedsCommit(). + if (!m_layerTreeHost) + return false; + if (!CCSettings::acceleratedAnimationEnabled()) return false; |