| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 // root. | 736 // root. |
| 737 GraphicsLayer* rootLayer = m_rootContentLayer.get(); | 737 GraphicsLayer* rootLayer = m_rootContentLayer.get(); |
| 738 if (flags & LayerTreeIncludesRootLayer) | 738 if (flags & LayerTreeIncludesRootLayer) |
| 739 rootLayer = rootGraphicsLayer(); | 739 rootLayer = rootGraphicsLayer(); |
| 740 | 740 |
| 741 String layerTreeText = rootLayer->layerTreeAsText(flags); | 741 String layerTreeText = rootLayer->layerTreeAsText(flags); |
| 742 | 742 |
| 743 // The true root layer is not included in the dump, so if we want to report | 743 // The true root layer is not included in the dump, so if we want to report |
| 744 // its repaint rects, they must be included here. | 744 // its repaint rects, they must be included here. |
| 745 if (flags & LayerTreeIncludesRepaintRects) | 745 if (flags & LayerTreeIncludesRepaintRects) |
| 746 return m_renderView.frameView()->trackedRepaintRectsAsText() + layerTree
Text; | 746 return m_renderView.frameView()->trackedPaintInvalidationRectsAsText() +
layerTreeText; |
| 747 | 747 |
| 748 return layerTreeText; | 748 return layerTreeText; |
| 749 } | 749 } |
| 750 | 750 |
| 751 RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderPart
* renderer) | 751 RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderPart
* renderer) |
| 752 { | 752 { |
| 753 if (!renderer->node()->isFrameOwnerElement()) | 753 if (!renderer->node()->isFrameOwnerElement()) |
| 754 return 0; | 754 return 0; |
| 755 | 755 |
| 756 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(renderer->node()); | 756 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(renderer->node()); |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 } else if (graphicsLayer == m_scrollLayer.get()) { | 1395 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1396 name = "LocalFrame Scrolling Layer"; | 1396 name = "LocalFrame Scrolling Layer"; |
| 1397 } else { | 1397 } else { |
| 1398 ASSERT_NOT_REACHED(); | 1398 ASSERT_NOT_REACHED(); |
| 1399 } | 1399 } |
| 1400 | 1400 |
| 1401 return name; | 1401 return name; |
| 1402 } | 1402 } |
| 1403 | 1403 |
| 1404 } // namespace WebCore | 1404 } // namespace WebCore |
| OLD | NEW |