| 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 2416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2427 DisableCompositingQueryAsserts disabler; | 2427 DisableCompositingQueryAsserts disabler; |
| 2428 // Allow throttling to make sure no painting paths (e.g., | 2428 // Allow throttling to make sure no painting paths (e.g., |
| 2429 // ContentLayerDelegate::paintContents) try to paint throttled content. | 2429 // ContentLayerDelegate::paintContents) try to paint throttled content. |
| 2430 DocumentLifecycle::AllowThrottlingScope allowThrottling(m_owningLayer.layout
Object()->document().lifecycle()); | 2430 DocumentLifecycle::AllowThrottlingScope allowThrottling(m_owningLayer.layout
Object()->document().lifecycle()); |
| 2431 #if ENABLE(ASSERT) | 2431 #if ENABLE(ASSERT) |
| 2432 // FIXME: once the state machine is ready, this can be removed and we can re
fer to that instead. | 2432 // FIXME: once the state machine is ready, this can be removed and we can re
fer to that instead. |
| 2433 if (Page* page = layoutObject()->frame()->page()) | 2433 if (Page* page = layoutObject()->frame()->page()) |
| 2434 page->setIsPainting(true); | 2434 page->setIsPainting(true); |
| 2435 #endif | 2435 #endif |
| 2436 | 2436 |
| 2437 TRACE_EVENT1("devtools.timeline", "Paint", "data", InspectorPaintEvent::data
(m_owningLayer.layoutObject(), LayoutRect(interestRect), graphicsLayer)); | 2437 TRACE_EVENT1("devtools.timeline,rail", "Paint", "data", InspectorPaintEvent:
:data(m_owningLayer.layoutObject(), LayoutRect(interestRect), graphicsLayer)); |
| 2438 | 2438 |
| 2439 PaintLayerFlags paintLayerFlags = 0; | 2439 PaintLayerFlags paintLayerFlags = 0; |
| 2440 if (graphicsLayerPaintingPhase & GraphicsLayerPaintBackground) | 2440 if (graphicsLayerPaintingPhase & GraphicsLayerPaintBackground) |
| 2441 paintLayerFlags |= PaintLayerPaintingCompositingBackgroundPhase; | 2441 paintLayerFlags |= PaintLayerPaintingCompositingBackgroundPhase; |
| 2442 else | 2442 else |
| 2443 paintLayerFlags |= PaintLayerPaintingSkipRootBackground; | 2443 paintLayerFlags |= PaintLayerPaintingSkipRootBackground; |
| 2444 if (graphicsLayerPaintingPhase & GraphicsLayerPaintForeground) | 2444 if (graphicsLayerPaintingPhase & GraphicsLayerPaintForeground) |
| 2445 paintLayerFlags |= PaintLayerPaintingCompositingForegroundPhase; | 2445 paintLayerFlags |= PaintLayerPaintingCompositingForegroundPhase; |
| 2446 if (graphicsLayerPaintingPhase & GraphicsLayerPaintMask) | 2446 if (graphicsLayerPaintingPhase & GraphicsLayerPaintMask) |
| 2447 paintLayerFlags |= PaintLayerPaintingCompositingMaskPhase; | 2447 paintLayerFlags |= PaintLayerPaintingCompositingMaskPhase; |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2709 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2709 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2710 name = "Scrolling Contents Layer"; | 2710 name = "Scrolling Contents Layer"; |
| 2711 } else { | 2711 } else { |
| 2712 ASSERT_NOT_REACHED(); | 2712 ASSERT_NOT_REACHED(); |
| 2713 } | 2713 } |
| 2714 | 2714 |
| 2715 return name; | 2715 return name; |
| 2716 } | 2716 } |
| 2717 | 2717 |
| 2718 } // namespace blink | 2718 } // namespace blink |
| OLD | NEW |