| 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 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2257 return client ? client->isTrackingPaintInvalidations() : false; | 2257 return client ? client->isTrackingPaintInvalidations() : false; |
| 2258 } | 2258 } |
| 2259 | 2259 |
| 2260 #if ENABLE(ASSERT) | 2260 #if ENABLE(ASSERT) |
| 2261 void CompositedLayerMapping::verifyNotPainting() | 2261 void CompositedLayerMapping::verifyNotPainting() |
| 2262 { | 2262 { |
| 2263 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); | 2263 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); |
| 2264 } | 2264 } |
| 2265 #endif | 2265 #endif |
| 2266 | 2266 |
| 2267 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
monotonicTime) | 2267 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
monotonicTime, int) |
| 2268 { | 2268 { |
| 2269 renderer()->node()->document().compositorPendingAnimations().notifyComposito
rAnimationStarted(monotonicTime); | 2269 renderer()->node()->document().compositorPendingAnimations().notifyComposito
rAnimationStarted(monotonicTime); |
| 2270 } | 2270 } |
| 2271 | 2271 |
| 2272 IntRect CompositedLayerMapping::pixelSnappedCompositedBounds() const | 2272 IntRect CompositedLayerMapping::pixelSnappedCompositedBounds() const |
| 2273 { | 2273 { |
| 2274 LayoutRect bounds = m_compositedBounds; | 2274 LayoutRect bounds = m_compositedBounds; |
| 2275 bounds.move(m_owningLayer.subpixelAccumulation()); | 2275 bounds.move(m_owningLayer.subpixelAccumulation()); |
| 2276 return pixelSnappedIntRect(bounds); | 2276 return pixelSnappedIntRect(bounds); |
| 2277 } | 2277 } |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2369 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2369 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2370 name = "Scrolling Block Selection Layer"; | 2370 name = "Scrolling Block Selection Layer"; |
| 2371 } else { | 2371 } else { |
| 2372 ASSERT_NOT_REACHED(); | 2372 ASSERT_NOT_REACHED(); |
| 2373 } | 2373 } |
| 2374 | 2374 |
| 2375 return name; | 2375 return name; |
| 2376 } | 2376 } |
| 2377 | 2377 |
| 2378 } // namespace blink | 2378 } // namespace blink |
| OLD | NEW |