| 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 3438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3449 | 3449 |
| 3450 m_squashedLayers.remove(nextSquashedLayerIndex, | 3450 m_squashedLayers.remove(nextSquashedLayerIndex, |
| 3451 m_squashedLayers.size() - nextSquashedLayerIndex); | 3451 m_squashedLayers.size() - nextSquashedLayerIndex); |
| 3452 } | 3452 } |
| 3453 } | 3453 } |
| 3454 | 3454 |
| 3455 String CompositedLayerMapping::debugName( | 3455 String CompositedLayerMapping::debugName( |
| 3456 const GraphicsLayer* graphicsLayer) const { | 3456 const GraphicsLayer* graphicsLayer) const { |
| 3457 String name; | 3457 String name; |
| 3458 if (graphicsLayer == m_graphicsLayer.get()) { | 3458 if (graphicsLayer == m_graphicsLayer.get()) { |
| 3459 name = m_owningLayer.debugName(); | 3459 name = "Main Layer " + m_owningLayer.debugName(); |
| 3460 } else if (graphicsLayer == m_squashingContainmentLayer.get()) { | 3460 } else if (graphicsLayer == m_squashingContainmentLayer.get()) { |
| 3461 name = "Squashing Containment Layer"; | 3461 name = "Squashing Containment Layer " + m_owningLayer.debugName(); |
| 3462 } else if (graphicsLayer == m_squashingLayer.get()) { | 3462 } else if (graphicsLayer == m_squashingLayer.get()) { |
| 3463 name = "Squashing Layer (first squashed layer: " + | 3463 name = "Squashing Layer (first squashed layer: " + |
| 3464 (m_squashedLayers.size() > 0 | 3464 (m_squashedLayers.size() > 0 |
| 3465 ? m_squashedLayers[0].paintLayer->debugName() | 3465 ? m_squashedLayers[0].paintLayer->debugName() |
| 3466 : "") + | 3466 : "") + |
| 3467 ")"; | 3467 ") " + m_owningLayer.debugName(); |
| 3468 } else if (graphicsLayer == m_ancestorClippingLayer.get()) { | 3468 } else if (graphicsLayer == m_ancestorClippingLayer.get()) { |
| 3469 name = "Ancestor Clipping Layer"; | 3469 name = "Ancestor Clipping Layer"; |
| 3470 } else if (graphicsLayer == m_ancestorClippingMaskLayer.get()) { | 3470 } else if (graphicsLayer == m_ancestorClippingMaskLayer.get()) { |
| 3471 name = "Ancestor Clipping Mask Layer"; | 3471 name = "Ancestor Clipping Mask Layer"; |
| 3472 } else if (graphicsLayer == m_foregroundLayer.get()) { | 3472 } else if (graphicsLayer == m_foregroundLayer.get()) { |
| 3473 name = m_owningLayer.debugName() + " (foreground) Layer"; | 3473 name = m_owningLayer.debugName() + " (foreground) Layer"; |
| 3474 } else if (graphicsLayer == m_backgroundLayer.get()) { | 3474 } else if (graphicsLayer == m_backgroundLayer.get()) { |
| 3475 name = m_owningLayer.debugName() + " (background) Layer"; | 3475 name = m_owningLayer.debugName() + " (background) Layer"; |
| 3476 } else if (graphicsLayer == m_childContainmentLayer.get()) { | 3476 } else if (graphicsLayer == m_childContainmentLayer.get()) { |
| 3477 name = "Child Containment Layer"; | 3477 name = "Child Containment Layer " + m_owningLayer.debugName(); |
| 3478 } else if (graphicsLayer == m_childTransformLayer.get()) { | 3478 } else if (graphicsLayer == m_childTransformLayer.get()) { |
| 3479 name = "Child Transform Layer"; | 3479 name = "Child Transform Layer " + m_owningLayer.debugName(); |
| 3480 } else if (graphicsLayer == m_maskLayer.get()) { | 3480 } else if (graphicsLayer == m_maskLayer.get()) { |
| 3481 name = "Mask Layer"; | 3481 name = "Mask Layer " + m_owningLayer.debugName(); |
| 3482 } else if (graphicsLayer == m_childClippingMaskLayer.get()) { | 3482 } else if (graphicsLayer == m_childClippingMaskLayer.get()) { |
| 3483 name = "Child Clipping Mask Layer"; | 3483 name = "Child Clipping Mask Layer " + m_owningLayer.debugName(); |
| 3484 } else if (graphicsLayer == m_layerForHorizontalScrollbar.get()) { | 3484 } else if (graphicsLayer == m_layerForHorizontalScrollbar.get()) { |
| 3485 name = "Horizontal Scrollbar Layer"; | 3485 name = "Horizontal Scrollbar Layer " + m_owningLayer.debugName(); |
| 3486 } else if (graphicsLayer == m_layerForVerticalScrollbar.get()) { | 3486 } else if (graphicsLayer == m_layerForVerticalScrollbar.get()) { |
| 3487 name = "Vertical Scrollbar Layer"; | 3487 name = "Vertical Scrollbar Layer " + m_owningLayer.debugName(); |
| 3488 } else if (graphicsLayer == m_layerForScrollCorner.get()) { | 3488 } else if (graphicsLayer == m_layerForScrollCorner.get()) { |
| 3489 name = "Scroll Corner Layer"; | 3489 name = "Scroll Corner Layer " + m_owningLayer.debugName(); |
| 3490 } else if (graphicsLayer == m_overflowControlsHostLayer.get()) { | 3490 } else if (graphicsLayer == m_overflowControlsHostLayer.get()) { |
| 3491 name = "Overflow Controls Host Layer"; | 3491 name = "Overflow Controls Host Layer " + m_owningLayer.debugName(); |
| 3492 } else if (graphicsLayer == m_overflowControlsAncestorClippingLayer.get()) { | 3492 } else if (graphicsLayer == m_overflowControlsAncestorClippingLayer.get()) { |
| 3493 name = "Overflow Controls Ancestor Clipping Layer"; | 3493 name = "Overflow Controls Ancestor Clipping Layer " + |
| 3494 m_owningLayer.debugName(); |
| 3494 } else if (graphicsLayer == m_scrollingLayer.get()) { | 3495 } else if (graphicsLayer == m_scrollingLayer.get()) { |
| 3495 name = "Scrolling Layer"; | 3496 name = "Scrolling Layer " + m_owningLayer.debugName(); |
| 3496 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 3497 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 3497 name = "Scrolling Contents Layer"; | 3498 name = "Scrolling Contents Layer"; |
| 3498 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3499 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
| 3499 name = "Decoration Layer"; | 3500 name = "Decoration Layer"; |
| 3500 } else { | 3501 } else { |
| 3501 ASSERT_NOT_REACHED(); | 3502 ASSERT_NOT_REACHED(); |
| 3502 } | 3503 } |
| 3503 | 3504 |
| 3504 return name; | 3505 return name; |
| 3505 } | 3506 } |
| 3506 | 3507 |
| 3507 } // namespace blink | 3508 } // namespace blink |
| OLD | NEW |