| 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 3213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3224 // compute and cache clipRects. | 3224 // compute and cache clipRects. |
| 3225 doPaintTask(paintInfo, *graphicsLayer, paintLayerFlags, context, | 3225 doPaintTask(paintInfo, *graphicsLayer, paintLayerFlags, context, |
| 3226 interestRect); | 3226 interestRect); |
| 3227 } else if (graphicsLayer == m_squashingLayer.get()) { | 3227 } else if (graphicsLayer == m_squashingLayer.get()) { |
| 3228 for (size_t i = 0; i < m_squashedLayers.size(); ++i) | 3228 for (size_t i = 0; i < m_squashedLayers.size(); ++i) |
| 3229 doPaintTask(m_squashedLayers[i], *graphicsLayer, paintLayerFlags, context, | 3229 doPaintTask(m_squashedLayers[i], *graphicsLayer, paintLayerFlags, context, |
| 3230 interestRect); | 3230 interestRect); |
| 3231 } else if (isScrollableAreaLayer(graphicsLayer)) { | 3231 } else if (isScrollableAreaLayer(graphicsLayer)) { |
| 3232 paintScrollableArea(graphicsLayer, context, interestRect); | 3232 paintScrollableArea(graphicsLayer, context, interestRect); |
| 3233 } | 3233 } |
| 3234 InspectorInstrumentation::didPaint(m_owningLayer.layoutObject().frame(), | 3234 probe::didPaint(m_owningLayer.layoutObject().frame(), graphicsLayer, context, |
| 3235 graphicsLayer, context, | 3235 LayoutRect(interestRect)); |
| 3236 LayoutRect(interestRect)); | |
| 3237 #if DCHECK_IS_ON() | 3236 #if DCHECK_IS_ON() |
| 3238 if (Page* page = layoutObject().frame()->page()) | 3237 if (Page* page = layoutObject().frame()->page()) |
| 3239 page->setIsPainting(false); | 3238 page->setIsPainting(false); |
| 3240 #endif | 3239 #endif |
| 3241 } | 3240 } |
| 3242 | 3241 |
| 3243 void CompositedLayerMapping::paintScrollableArea( | 3242 void CompositedLayerMapping::paintScrollableArea( |
| 3244 const GraphicsLayer* graphicsLayer, | 3243 const GraphicsLayer* graphicsLayer, |
| 3245 GraphicsContext& context, | 3244 GraphicsContext& context, |
| 3246 const IntRect& interestRect) const { | 3245 const IntRect& interestRect) const { |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3481 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3480 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
| 3482 name = "Decoration Layer"; | 3481 name = "Decoration Layer"; |
| 3483 } else { | 3482 } else { |
| 3484 ASSERT_NOT_REACHED(); | 3483 ASSERT_NOT_REACHED(); |
| 3485 } | 3484 } |
| 3486 | 3485 |
| 3487 return name; | 3486 return name; |
| 3488 } | 3487 } |
| 3489 | 3488 |
| 3490 } // namespace blink | 3489 } // namespace blink |
| OLD | NEW |