| 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 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2127 #if ENABLE(ASSERT) | 2127 #if ENABLE(ASSERT) |
| 2128 paintInfo.renderLayer->renderer()->assertSubtreeIsLaidOut(); | 2128 paintInfo.renderLayer->renderer()->assertSubtreeIsLaidOut(); |
| 2129 #endif | 2129 #endif |
| 2130 | 2130 |
| 2131 if (paintInfo.renderLayer->compositingState() != PaintsIntoGroupedBacking) { | 2131 if (paintInfo.renderLayer->compositingState() != PaintsIntoGroupedBacking) { |
| 2132 // FIXME: GraphicsLayers need a way to split for RenderRegions. | 2132 // FIXME: GraphicsLayers need a way to split for RenderRegions. |
| 2133 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); | 2133 LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBe
haviorNormal, paintInfo.renderLayer->subpixelAccumulation()); |
| 2134 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, paintin
gInfo, paintLayerFlags); | 2134 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, paintin
gInfo, paintLayerFlags); |
| 2135 | 2135 |
| 2136 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { | 2136 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { |
| 2137 |
| 2138 #ifndef NDEBUG |
| 2139 context->fillRect(dirtyRect, Color(0xFF, 0, 0)); |
| 2140 #endif |
| 2141 |
| 2137 if (RenderView* view = paintInfo.renderLayer->renderer()->view()) { | 2142 if (RenderView* view = paintInfo.renderLayer->renderer()->view()) { |
| 2138 const PaintCommandList& paintCommandList = view->viewDisplayList
().paintCommandList(); | 2143 const PaintCommandList& paintCommandList = view->viewDisplayList
().paintCommandList(); |
| 2139 for (PaintCommandList::const_iterator it = paintCommandList.begi
n(); it != paintCommandList.end(); ++it) | 2144 for (PaintCommandList::const_iterator it = paintCommandList.begi
n(); it != paintCommandList.end(); ++it) |
| 2140 context->drawDisplayList(it->get()->displayList.get()); | 2145 context->drawDisplayList(it->get()->displayList.get()); |
| 2141 } | 2146 } |
| 2142 } | 2147 } |
| 2143 | 2148 |
| 2144 if (paintInfo.renderLayer->containsDirtyOverlayScrollbars()) | 2149 if (paintInfo.renderLayer->containsDirtyOverlayScrollbars()) |
| 2145 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, pai
ntingInfo, paintLayerFlags | PaintLayerPaintingOverlayScrollbars); | 2150 LayerPainter(*paintInfo.renderLayer).paintLayerContents(context, pai
ntingInfo, paintLayerFlags | PaintLayerPaintingOverlayScrollbars); |
| 2146 } else { | 2151 } else { |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2369 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2374 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2370 name = "Scrolling Block Selection Layer"; | 2375 name = "Scrolling Block Selection Layer"; |
| 2371 } else { | 2376 } else { |
| 2372 ASSERT_NOT_REACHED(); | 2377 ASSERT_NOT_REACHED(); |
| 2373 } | 2378 } |
| 2374 | 2379 |
| 2375 return name; | 2380 return name; |
| 2376 } | 2381 } |
| 2377 | 2382 |
| 2378 } // namespace blink | 2383 } // namespace blink |
| OLD | NEW |