| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 2190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2201 return client ? client->isTrackingPaintInvalidations() : false; | 2201 return client ? client->isTrackingPaintInvalidations() : false; |
| 2202 } | 2202 } |
| 2203 | 2203 |
| 2204 #if ENABLE(ASSERT) | 2204 #if ENABLE(ASSERT) |
| 2205 void CompositedLayerMapping::verifyNotPainting() | 2205 void CompositedLayerMapping::verifyNotPainting() |
| 2206 { | 2206 { |
| 2207 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); | 2207 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); |
| 2208 } | 2208 } |
| 2209 #endif | 2209 #endif |
| 2210 | 2210 |
| 2211 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
monotonicTime, int) | 2211 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
monotonicTime, int group) |
| 2212 { | 2212 { |
| 2213 renderer()->node()->document().compositorPendingAnimations().notifyComposito
rAnimationStarted(monotonicTime); | 2213 renderer()->node()->document().compositorPendingAnimations().notifyComposito
rAnimationStarted(monotonicTime, group); |
| 2214 } | 2214 } |
| 2215 | 2215 |
| 2216 IntRect CompositedLayerMapping::pixelSnappedCompositedBounds() const | 2216 IntRect CompositedLayerMapping::pixelSnappedCompositedBounds() const |
| 2217 { | 2217 { |
| 2218 LayoutRect bounds = m_compositedBounds; | 2218 LayoutRect bounds = m_compositedBounds; |
| 2219 bounds.move(m_owningLayer.subpixelAccumulation()); | 2219 bounds.move(m_owningLayer.subpixelAccumulation()); |
| 2220 return pixelSnappedIntRect(bounds); | 2220 return pixelSnappedIntRect(bounds); |
| 2221 } | 2221 } |
| 2222 | 2222 |
| 2223 bool CompositedLayerMapping::updateSquashingLayerAssignment(RenderLayer* squashe
dLayer, const RenderLayer& owningLayer, size_t nextSquashedLayerIndex) | 2223 bool CompositedLayerMapping::updateSquashingLayerAssignment(RenderLayer* squashe
dLayer, const RenderLayer& owningLayer, size_t nextSquashedLayerIndex) |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2313 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2313 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2314 name = "Scrolling Block Selection Layer"; | 2314 name = "Scrolling Block Selection Layer"; |
| 2315 } else { | 2315 } else { |
| 2316 ASSERT_NOT_REACHED(); | 2316 ASSERT_NOT_REACHED(); |
| 2317 } | 2317 } |
| 2318 | 2318 |
| 2319 return name; | 2319 return name; |
| 2320 } | 2320 } |
| 2321 | 2321 |
| 2322 } // namespace blink | 2322 } // namespace blink |
| OLD | NEW |