| 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 2947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2958 pictureBuilder.endRecording()->playback(context.canvas()); | 2958 pictureBuilder.endRecording()->playback(context.canvas()); |
| 2959 } | 2959 } |
| 2960 | 2960 |
| 2961 bool CompositedLayerMapping::isScrollableAreaLayer( | 2961 bool CompositedLayerMapping::isScrollableAreaLayer( |
| 2962 const GraphicsLayer* graphicsLayer) const { | 2962 const GraphicsLayer* graphicsLayer) const { |
| 2963 return graphicsLayer == layerForHorizontalScrollbar() || | 2963 return graphicsLayer == layerForHorizontalScrollbar() || |
| 2964 graphicsLayer == layerForVerticalScrollbar() || | 2964 graphicsLayer == layerForVerticalScrollbar() || |
| 2965 graphicsLayer == layerForScrollCorner(); | 2965 graphicsLayer == layerForScrollCorner(); |
| 2966 } | 2966 } |
| 2967 | 2967 |
| 2968 bool CompositedLayerMapping::isTrackingPaintInvalidations() const { | 2968 bool CompositedLayerMapping::isTrackingRasterInvalidations() const { |
| 2969 GraphicsLayerClient* client = compositor(); | 2969 GraphicsLayerClient* client = compositor(); |
| 2970 return client ? client->isTrackingPaintInvalidations() : false; | 2970 return client ? client->isTrackingRasterInvalidations() : false; |
| 2971 } | 2971 } |
| 2972 | 2972 |
| 2973 #if ENABLE(ASSERT) | 2973 #if ENABLE(ASSERT) |
| 2974 void CompositedLayerMapping::verifyNotPainting() { | 2974 void CompositedLayerMapping::verifyNotPainting() { |
| 2975 ASSERT(!layoutObject()->frame()->page() || | 2975 ASSERT(!layoutObject()->frame()->page() || |
| 2976 !layoutObject()->frame()->page()->isPainting()); | 2976 !layoutObject()->frame()->page()->isPainting()); |
| 2977 } | 2977 } |
| 2978 #endif | 2978 #endif |
| 2979 | 2979 |
| 2980 void CompositedLayerMapping::notifyPaint(bool isFirstPaint, | 2980 void CompositedLayerMapping::notifyPaint(bool isFirstPaint, |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3130 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 3130 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 3131 name = "Scrolling Contents Layer"; | 3131 name = "Scrolling Contents Layer"; |
| 3132 } else { | 3132 } else { |
| 3133 ASSERT_NOT_REACHED(); | 3133 ASSERT_NOT_REACHED(); |
| 3134 } | 3134 } |
| 3135 | 3135 |
| 3136 return name; | 3136 return name; |
| 3137 } | 3137 } |
| 3138 | 3138 |
| 3139 } // namespace blink | 3139 } // namespace blink |
| OLD | NEW |