| 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 2202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2213 } else if (graphicsLayer == layerForScrollCorner()) { | 2213 } else if (graphicsLayer == layerForScrollCorner()) { |
| 2214 IntPoint scrollCornerAndResizerLocation = m_owningLayer.scrollableArea()
->scrollCornerAndResizerRect().location(); | 2214 IntPoint scrollCornerAndResizerLocation = m_owningLayer.scrollableArea()
->scrollCornerAndResizerRect().location(); |
| 2215 ScrollableAreaPainter(*m_owningLayer.scrollableArea()).paintScrollCorner
(&context, -scrollCornerAndResizerLocation, clip); | 2215 ScrollableAreaPainter(*m_owningLayer.scrollableArea()).paintScrollCorner
(&context, -scrollCornerAndResizerLocation, clip); |
| 2216 ScrollableAreaPainter(*m_owningLayer.scrollableArea()).paintResizer(&con
text, -scrollCornerAndResizerLocation, clip); | 2216 ScrollableAreaPainter(*m_owningLayer.scrollableArea()).paintResizer(&con
text, -scrollCornerAndResizerLocation, clip); |
| 2217 } | 2217 } |
| 2218 InspectorInstrumentation::didPaint(m_owningLayer.layoutObject(), graphicsLay
er, &context, LayoutRect(clip)); | 2218 InspectorInstrumentation::didPaint(m_owningLayer.layoutObject(), graphicsLay
er, &context, LayoutRect(clip)); |
| 2219 #if ENABLE(ASSERT) | 2219 #if ENABLE(ASSERT) |
| 2220 if (Page* page = layoutObject()->frame()->page()) | 2220 if (Page* page = layoutObject()->frame()->page()) |
| 2221 page->setIsPainting(false); | 2221 page->setIsPainting(false); |
| 2222 #endif | 2222 #endif |
| 2223 |
| 2224 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
| 2225 m_owningLayer.layoutObject()->clearRepaintFlagsRecursively(); |
| 2223 } | 2226 } |
| 2224 | 2227 |
| 2225 bool CompositedDeprecatedPaintLayerMapping::isTrackingPaintInvalidations() const | 2228 bool CompositedDeprecatedPaintLayerMapping::isTrackingPaintInvalidations() const |
| 2226 { | 2229 { |
| 2227 GraphicsLayerClient* client = compositor(); | 2230 GraphicsLayerClient* client = compositor(); |
| 2228 return client ? client->isTrackingPaintInvalidations() : false; | 2231 return client ? client->isTrackingPaintInvalidations() : false; |
| 2229 } | 2232 } |
| 2230 | 2233 |
| 2231 #if ENABLE(ASSERT) | 2234 #if ENABLE(ASSERT) |
| 2232 void CompositedDeprecatedPaintLayerMapping::verifyNotPainting() | 2235 void CompositedDeprecatedPaintLayerMapping::verifyNotPainting() |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2375 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2378 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2376 name = "Scrolling Block Selection Layer"; | 2379 name = "Scrolling Block Selection Layer"; |
| 2377 } else { | 2380 } else { |
| 2378 ASSERT_NOT_REACHED(); | 2381 ASSERT_NOT_REACHED(); |
| 2379 } | 2382 } |
| 2380 | 2383 |
| 2381 return name; | 2384 return name; |
| 2382 } | 2385 } |
| 2383 | 2386 |
| 2384 } // namespace blink | 2387 } // namespace blink |
| OLD | NEW |