| 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 2121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2132 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); | 2132 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); |
| 2133 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, paintin
gInfo, paintLayerFlags); | 2133 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, paintin
gInfo, paintLayerFlags); |
| 2134 | 2134 |
| 2135 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { | 2135 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { |
| 2136 | 2136 |
| 2137 #ifndef NDEBUG | 2137 #ifndef NDEBUG |
| 2138 context->fillRect(dirtyRect, Color(0xFF, 0, 0)); | 2138 context->fillRect(dirtyRect, Color(0xFF, 0, 0)); |
| 2139 #endif | 2139 #endif |
| 2140 | 2140 |
| 2141 if (RenderView* view = paintInfo.renderLayer->renderer()->view()) { | 2141 if (RenderView* view = paintInfo.renderLayer->renderer()->view()) { |
| 2142 const PaintCommandList& paintCommandList = view->viewDisplayList
().paintCommandList(); | 2142 const PaintList& paintList = view->viewDisplayList().paintList()
; |
| 2143 for (PaintCommandList::const_iterator it = paintCommandList.begi
n(); it != paintCommandList.end(); ++it) | 2143 for (PaintList::const_iterator it = paintList.begin(); it != pai
ntList.end(); ++it) |
| 2144 context->drawDisplayList(it->get()->displayList.get()); | 2144 (*it)->replay(context); |
| 2145 } | 2145 } |
| 2146 } | 2146 } |
| 2147 | 2147 |
| 2148 if (paintInfo.renderLayer->containsDirtyOverlayScrollbars()) | 2148 if (paintInfo.renderLayer->containsDirtyOverlayScrollbars()) |
| 2149 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, pai
ntingInfo, paintLayerFlags | PaintLayerPaintingOverlayScrollbars); | 2149 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, pai
ntingInfo, paintLayerFlags | PaintLayerPaintingOverlayScrollbars); |
| 2150 } else { | 2150 } else { |
| 2151 ASSERT(compositor()->layerSquashingEnabled()); | 2151 ASSERT(compositor()->layerSquashingEnabled()); |
| 2152 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); | 2152 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); |
| 2153 | 2153 |
| 2154 // RenderLayer::paintLayer assumes that the caller clips to the passed r
ect. Squashed layers need to do this clipping in software, | 2154 // RenderLayer::paintLayer assumes that the caller clips to the passed r
ect. Squashed layers need to do this clipping in software, |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2373 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2373 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2374 name = "Scrolling Block Selection Layer"; | 2374 name = "Scrolling Block Selection Layer"; |
| 2375 } else { | 2375 } else { |
| 2376 ASSERT_NOT_REACHED(); | 2376 ASSERT_NOT_REACHED(); |
| 2377 } | 2377 } |
| 2378 | 2378 |
| 2379 return name; | 2379 return name; |
| 2380 } | 2380 } |
| 2381 | 2381 |
| 2382 } // namespace blink | 2382 } // namespace blink |
| OLD | NEW |