Fix duplicate/missing entries in core.gypi.

This is a result of a bad merge in r162052.

R=abarth
BUG=303332

Review URL: https://codereview.chromium.org/98293005

git-svn-id: svn://svn.chromium.org/blink/trunk@163229 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Web Animations: Clarify logic for applying animated properties with matched properties cache

This change clarifies the logic in StyleResolver::applyMatchedProperties() to
make clear the three cases in which we need to apply animated properties when
using the matched properties cache. Note that
StyleResolver::applyAnimatedProperties() already null-checks the animating
element. This will simplify an upcoming change for pseudo elements in
https://codereview.chromium.org/76033002

Also rename some method parameters from 'e' to 'element' for clarity.

No functional change.

R=timloh@chromium.org

Review URL: https://codereview.chromium.org/99333008

git-svn-id: svn://svn.chromium.org/blink/trunk@163230 bbb929c8-8fbe-4397-9dbb-9b2b20218538