Chromium Code Reviews| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 #include "core/page/Page.h" | 42 #include "core/page/Page.h" |
| 43 #include "core/page/Settings.h" | 43 #include "core/page/Settings.h" |
| 44 #include "core/page/animation/AnimationController.h" | 44 #include "core/page/animation/AnimationController.h" |
| 45 #include "core/page/scrolling/ScrollingConstraints.h" | 45 #include "core/page/scrolling/ScrollingConstraints.h" |
| 46 #include "core/page/scrolling/ScrollingCoordinator.h" | 46 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 47 #include "core/platform/HistogramSupport.h" | 47 #include "core/platform/HistogramSupport.h" |
| 48 #include "core/platform/Logging.h" | 48 #include "core/platform/Logging.h" |
| 49 #include "core/platform/ScrollbarTheme.h" | 49 #include "core/platform/ScrollbarTheme.h" |
| 50 #include "core/platform/chromium/TraceEvent.h" | 50 #include "core/platform/chromium/TraceEvent.h" |
| 51 #include "core/platform/graphics/GraphicsLayer.h" | 51 #include "core/platform/graphics/GraphicsLayer.h" |
| 52 #include "core/platform/graphics/GraphicsLayerClient.h" | |
| 52 #include "core/platform/graphics/transforms/TransformState.h" | 53 #include "core/platform/graphics/transforms/TransformState.h" |
| 53 #include "core/rendering/HitTestResult.h" | 54 #include "core/rendering/HitTestResult.h" |
| 54 #include "core/rendering/RenderApplet.h" | 55 #include "core/rendering/RenderApplet.h" |
| 55 #include "core/rendering/RenderEmbeddedObject.h" | 56 #include "core/rendering/RenderEmbeddedObject.h" |
| 56 #include "core/rendering/RenderFullScreen.h" | 57 #include "core/rendering/RenderFullScreen.h" |
| 57 #include "core/rendering/RenderGeometryMap.h" | 58 #include "core/rendering/RenderGeometryMap.h" |
| 58 #include "core/rendering/RenderIFrame.h" | 59 #include "core/rendering/RenderIFrame.h" |
| 59 #include "core/rendering/RenderLayerBacking.h" | 60 #include "core/rendering/RenderLayerBacking.h" |
| 60 #include "core/rendering/RenderReplica.h" | 61 #include "core/rendering/RenderReplica.h" |
| 61 #include "core/rendering/RenderVideo.h" | 62 #include "core/rendering/RenderVideo.h" |
| (...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1205 } | 1206 } |
| 1206 | 1207 |
| 1207 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) | 1208 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) |
| 1208 { | 1209 { |
| 1209 updateCompositingLayers(CompositingUpdateAfterLayout); | 1210 updateCompositingLayers(CompositingUpdateAfterLayout); |
| 1210 | 1211 |
| 1211 if (!m_rootContentLayer) | 1212 if (!m_rootContentLayer) |
| 1212 return String(); | 1213 return String(); |
| 1213 | 1214 |
| 1214 // We skip dumping the scroll and clip layers to keep layerTreeAsText output | 1215 // We skip dumping the scroll and clip layers to keep layerTreeAsText output |
| 1215 // similar between platforms. | 1216 // similar between platforms (unless we explicitly request dumping from the |
|
enne (OOO)
2013/07/03 18:26:57
layerTreeAsText is so fragile. :(
| |
| 1216 String layerTreeText = m_rootContentLayer->layerTreeAsText(flags); | 1217 // root. |
| 1218 GraphicsLayer* rootLayer = m_rootContentLayer.get(); | |
| 1219 if (flags & LayerTreeIncludesRootLayer) | |
| 1220 rootLayer = rootGraphicsLayer(); | |
| 1221 | |
| 1222 String layerTreeText = rootLayer->layerTreeAsText(flags); | |
| 1217 | 1223 |
| 1218 // The true root layer is not included in the dump, so if we want to report | 1224 // The true root layer is not included in the dump, so if we want to report |
| 1219 // its repaint rects, they must be included here. | 1225 // its repaint rects, they must be included here. |
| 1220 if (flags & LayerTreeIncludesRepaintRects) { | 1226 if (flags & LayerTreeIncludesRepaintRects) { |
| 1221 String layerTreeTextWithRootRepaintRects = m_renderView->frameView()->tr ackedRepaintRectsAsText(); | 1227 String layerTreeTextWithRootRepaintRects = m_renderView->frameView()->tr ackedRepaintRectsAsText(); |
| 1222 layerTreeTextWithRootRepaintRects.append(layerTreeText); | 1228 layerTreeTextWithRootRepaintRects.append(layerTreeText); |
| 1223 return layerTreeTextWithRootRepaintRects; | 1229 return layerTreeTextWithRootRepaintRects; |
| 1224 } | 1230 } |
| 1225 | 1231 |
| 1226 return layerTreeText; | 1232 return layerTreeText; |
| (...skipping 1525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2752 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); | 2758 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); |
| 2753 #if ENABLE(RUBBER_BANDING) | 2759 #if ENABLE(RUBBER_BANDING) |
| 2754 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); | 2760 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); |
| 2755 info.addMember(m_contentShadowLayer, "contentShadowLayer"); | 2761 info.addMember(m_contentShadowLayer, "contentShadowLayer"); |
| 2756 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); | 2762 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); |
| 2757 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); | 2763 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); |
| 2758 #endif | 2764 #endif |
| 2759 } | 2765 } |
| 2760 | 2766 |
| 2761 } // namespace WebCore | 2767 } // namespace WebCore |
| OLD | NEW |