| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2014 Google Inc. All rights reserved. | 3 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 descendantHas3DTransform |= anyDescendantHas3DTransform || layer->has3DT
ransform(); | 501 descendantHas3DTransform |= anyDescendantHas3DTransform || layer->has3DT
ransform(); |
| 502 } | 502 } |
| 503 | 503 |
| 504 // At this point we have finished collecting all reasons to composite this l
ayer. | 504 // At this point we have finished collecting all reasons to composite this l
ayer. |
| 505 layer->setCompositingReasons(reasonsToComposite); | 505 layer->setCompositingReasons(reasonsToComposite); |
| 506 | 506 |
| 507 } | 507 } |
| 508 | 508 |
| 509 bool CompositingRequirementsUpdater::isRunningAcceleratedTransformAnimation(Rend
erObject* renderer) const | 509 bool CompositingRequirementsUpdater::isRunningAcceleratedTransformAnimation(Rend
erObject* renderer) const |
| 510 { | 510 { |
| 511 if (!m_compositingReasonFinder.hasAnimationTrigger()) | |
| 512 return false; | |
| 513 return renderer->style()->hasCurrentTransformAnimation(); | 511 return renderer->style()->hasCurrentTransformAnimation(); |
| 514 } | 512 } |
| 515 | 513 |
| 516 } // namespace WebCore | 514 } // namespace WebCore |
| OLD | NEW |