OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Peter Kelly (pmk@post.com) | 4 * (C) 2001 Peter Kelly (pmk@post.com) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * (C) 2007 David Smith (catfish.man@gmail.com) | 6 * (C) 2007 David Smith (catfish.man@gmail.com) |
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
All rights reserved. | 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
All rights reserved. |
8 * (C) 2007 Eric Seidel (eric@webkit.org) | 8 * (C) 2007 Eric Seidel (eric@webkit.org) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1380 // FIXME: We call detach from within style recalc, so compositin
gState is not up to date. | 1380 // FIXME: We call detach from within style recalc, so compositin
gState is not up to date. |
1381 // https://code.google.com/p/chromium/issues/detail?id=339847 | 1381 // https://code.google.com/p/chromium/issues/detail?id=339847 |
1382 DisableCompositingQueryAsserts disabler; | 1382 DisableCompositingQueryAsserts disabler; |
1383 | 1383 |
1384 // FIXME: restart compositor animations rather than pull back to
the main thread | 1384 // FIXME: restart compositor animations rather than pull back to
the main thread |
1385 activeAnimations->cancelAnimationOnCompositor(); | 1385 activeAnimations->cancelAnimationOnCompositor(); |
1386 } else { | 1386 } else { |
1387 activeAnimations->cssAnimations().cancel(); | 1387 activeAnimations->cssAnimations().cancel(); |
1388 activeAnimations->setAnimationStyleChange(false); | 1388 activeAnimations->setAnimationStyleChange(false); |
1389 } | 1389 } |
| 1390 activeAnimations->clearBaseRenderStyle(); |
1390 } | 1391 } |
1391 | 1392 |
1392 if (ElementShadow* shadow = data->shadow()) | 1393 if (ElementShadow* shadow = data->shadow()) |
1393 shadow->detach(context); | 1394 shadow->detach(context); |
1394 } | 1395 } |
1395 ContainerNode::detach(context); | 1396 ContainerNode::detach(context); |
1396 } | 1397 } |
1397 | 1398 |
1398 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS
tyle* newStyle) | 1399 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS
tyle* newStyle) |
1399 { | 1400 { |
(...skipping 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3266 return wrapper; | 3267 return wrapper; |
3267 | 3268 |
3268 CustomElementBinding* binding = perContextData->customElementBinding(customE
lementDefinition()); | 3269 CustomElementBinding* binding = perContextData->customElementBinding(customE
lementDefinition()); |
3269 | 3270 |
3270 wrapper->SetPrototype(binding->prototype()); | 3271 wrapper->SetPrototype(binding->prototype()); |
3271 | 3272 |
3272 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType
, wrapper, isolate); | 3273 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType
, wrapper, isolate); |
3273 } | 3274 } |
3274 | 3275 |
3275 } // namespace blink | 3276 } // namespace blink |
OLD | NEW |