| 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 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2053 return rects.release(); | 2053 return rects.release(); |
| 2054 } | 2054 } |
| 2055 | 2055 |
| 2056 #ifndef NDEBUG | 2056 #ifndef NDEBUG |
| 2057 void CompositedLayerMapping::verifyNotPainting() | 2057 void CompositedLayerMapping::verifyNotPainting() |
| 2058 { | 2058 { |
| 2059 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); | 2059 ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPaint
ing()); |
| 2060 } | 2060 } |
| 2061 #endif | 2061 #endif |
| 2062 | 2062 |
| 2063 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
wallClockTime, double monotonicTime) | 2063 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
monotonicTime) |
| 2064 { | 2064 { |
| 2065 renderer()->node()->document().cssPendingAnimations().notifyCompositorAnimat
ionStarted(monotonicTime); | 2065 renderer()->node()->document().cssPendingAnimations().notifyCompositorAnimat
ionStarted(monotonicTime); |
| 2066 } | 2066 } |
| 2067 | 2067 |
| 2068 LayoutRect CompositedLayerMapping::compositedBounds() const | 2068 LayoutRect CompositedLayerMapping::compositedBounds() const |
| 2069 { | 2069 { |
| 2070 return m_compositedBounds; | 2070 return m_compositedBounds; |
| 2071 } | 2071 } |
| 2072 | 2072 |
| 2073 void CompositedLayerMapping::setCompositedBounds(const LayoutRect& bounds) | 2073 void CompositedLayerMapping::setCompositedBounds(const LayoutRect& bounds) |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2163 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2163 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2164 name = "Scrolling Contents Layer"; | 2164 name = "Scrolling Contents Layer"; |
| 2165 } else { | 2165 } else { |
| 2166 ASSERT_NOT_REACHED(); | 2166 ASSERT_NOT_REACHED(); |
| 2167 } | 2167 } |
| 2168 | 2168 |
| 2169 return name; | 2169 return name; |
| 2170 } | 2170 } |
| 2171 | 2171 |
| 2172 } // namespace WebCore | 2172 } // namespace WebCore |
| OLD | NEW |