| 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 CompositingRequirementsUpdater(m_layoutView, m_compositingReasonFinder).
update(updateRoot); | 345 CompositingRequirementsUpdater(m_layoutView, m_compositingReasonFinder).
update(updateRoot); |
| 346 | 346 |
| 347 CompositingLayerAssigner layerAssigner(this); | 347 CompositingLayerAssigner layerAssigner(this); |
| 348 layerAssigner.assign(updateRoot, layersNeedingPaintInvalidation); | 348 layerAssigner.assign(updateRoot, layersNeedingPaintInvalidation); |
| 349 | 349 |
| 350 bool layersChanged = layerAssigner.layersChanged(); | 350 bool layersChanged = layerAssigner.layersChanged(); |
| 351 | 351 |
| 352 { | 352 { |
| 353 TRACE_EVENT0("blink", "DeprecatedPaintLayerCompositor::updateAfterCo
mpositingChange"); | 353 TRACE_EVENT0("blink", "DeprecatedPaintLayerCompositor::updateAfterCo
mpositingChange"); |
| 354 if (const FrameView::ScrollableAreaSet* scrollableAreas = m_layoutVi
ew.frameView()->scrollableAreas()) { | 354 if (const FrameView::ScrollableAreaSet* scrollableAreas = m_layoutVi
ew.frameView()->scrollableAreas()) { |
| 355 for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas
->begin(); it != scrollableAreas->end(); ++it) | 355 for (auto* scrollableArea : *scrollableAreas) |
| 356 layersChanged |= (*it)->updateAfterCompositingChange(); | 356 layersChanged |= scrollableArea->updateAfterCompositingChang
e(); |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 | 359 |
| 360 if (layersChanged) | 360 if (layersChanged) |
| 361 updateType = std::max(updateType, CompositingUpdateRebuildTree); | 361 updateType = std::max(updateType, CompositingUpdateRebuildTree); |
| 362 } | 362 } |
| 363 | 363 |
| 364 if (updateType != CompositingUpdateNone) { | 364 if (updateType != CompositingUpdateNone) { |
| 365 GraphicsLayerUpdater updater; | 365 GraphicsLayerUpdater updater; |
| 366 updater.update(*updateRoot, layersNeedingPaintInvalidation); | 366 updater.update(*updateRoot, layersNeedingPaintInvalidation); |
| (...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 } else if (graphicsLayer == m_scrollLayer.get()) { | 1181 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1182 name = "LocalFrame Scrolling Layer"; | 1182 name = "LocalFrame Scrolling Layer"; |
| 1183 } else { | 1183 } else { |
| 1184 ASSERT_NOT_REACHED(); | 1184 ASSERT_NOT_REACHED(); |
| 1185 } | 1185 } |
| 1186 | 1186 |
| 1187 return name; | 1187 return name; |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 } // namespace blink | 1190 } // namespace blink |
| OLD | NEW |