| 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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 // root. | 731 // root. |
| 732 GraphicsLayer* rootLayer = m_rootContentLayer.get(); | 732 GraphicsLayer* rootLayer = m_rootContentLayer.get(); |
| 733 if (flags & LayerTreeIncludesRootLayer) | 733 if (flags & LayerTreeIncludesRootLayer) |
| 734 rootLayer = rootGraphicsLayer(); | 734 rootLayer = rootGraphicsLayer(); |
| 735 | 735 |
| 736 String layerTreeText = rootLayer->layerTreeAsText(flags); | 736 String layerTreeText = rootLayer->layerTreeAsText(flags); |
| 737 | 737 |
| 738 // The true root layer is not included in the dump, so if we want to report | 738 // The true root layer is not included in the dump, so if we want to report |
| 739 // its repaint rects, they must be included here. | 739 // its repaint rects, they must be included here. |
| 740 if (flags & LayerTreeIncludesRepaintRects) | 740 if (flags & LayerTreeIncludesRepaintRects) |
| 741 return m_renderView.frameView()->trackedRepaintRectsAsText() + layerTree
Text; | 741 return m_renderView.frameView()->trackedPaintInvalidationRectsAsText() +
layerTreeText; |
| 742 | 742 |
| 743 return layerTreeText; | 743 return layerTreeText; |
| 744 } | 744 } |
| 745 | 745 |
| 746 RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderPart
* renderer) | 746 RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderPart
* renderer) |
| 747 { | 747 { |
| 748 if (!renderer->node()->isFrameOwnerElement()) | 748 if (!renderer->node()->isFrameOwnerElement()) |
| 749 return 0; | 749 return 0; |
| 750 | 750 |
| 751 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(renderer->node()); | 751 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(renderer->node()); |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 } else if (graphicsLayer == m_scrollLayer.get()) { | 1390 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1391 name = "LocalFrame Scrolling Layer"; | 1391 name = "LocalFrame Scrolling Layer"; |
| 1392 } else { | 1392 } else { |
| 1393 ASSERT_NOT_REACHED(); | 1393 ASSERT_NOT_REACHED(); |
| 1394 } | 1394 } |
| 1395 | 1395 |
| 1396 return name; | 1396 return name; |
| 1397 } | 1397 } |
| 1398 | 1398 |
| 1399 } // namespace WebCore | 1399 } // namespace WebCore |
| OLD | NEW |