Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1403 ASSERT(layoutItem.style()->hasViewportConstrainedPosition()); | 1403 ASSERT(layoutItem.style()->hasViewportConstrainedPosition()); |
| 1404 ASSERT(layoutItem.hasLayer()); | 1404 ASSERT(layoutItem.hasLayer()); |
| 1405 PaintLayer* layer = LayoutBoxModel(layoutItem).layer(); | 1405 PaintLayer* layer = LayoutBoxModel(layoutItem).layer(); |
| 1406 | 1406 |
| 1407 if (layer->isPaintInvalidationContainer()) | 1407 if (layer->isPaintInvalidationContainer()) |
| 1408 continue; | 1408 continue; |
| 1409 | 1409 |
| 1410 if (layer->subtreeIsInvisible()) | 1410 if (layer->subtreeIsInvisible()) |
| 1411 continue; | 1411 continue; |
| 1412 | 1412 |
| 1413 // invalidate even if there is an ancestor with a filter that moves pixe ls. | |
| 1414 layoutItem.setShouldDoFullPaintInvalidationIncludingNonCompositingDescen dants(); | |
| 1415 | |
| 1413 // If the fixed layer has a blur/drop-shadow filter applied on at least one of its parents, we cannot | 1416 // If the fixed layer has a blur/drop-shadow filter applied on at least one of its parents, we cannot |
| 1414 // scroll using the fast path, otherwise the outsets of the filter will be moved around the page. | 1417 // scroll using the fast path, otherwise the outsets of the filter will be moved around the page. |
| 1415 if (layer->hasAncestorWithFilterThatMovesPixels()) | 1418 if (layer->hasAncestorWithFilterThatMovesPixels()) |
| 1416 return false; | 1419 return false; |
| 1417 | 1420 |
| 1418 TRACE_EVENT_INSTANT1( | 1421 TRACE_EVENT_INSTANT1( |
|
Xianzhu
2016/06/23 17:43:56
This should be also moved above the return.
chrishtr
2016/06/23 18:16:17
Done.
| |
| 1419 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"), | 1422 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"), |
| 1420 "ScrollInvalidationTracking", | 1423 "ScrollInvalidationTracking", |
| 1421 TRACE_EVENT_SCOPE_THREAD, | 1424 TRACE_EVENT_SCOPE_THREAD, |
| 1422 "data", | 1425 "data", |
| 1423 InspectorScrollInvalidationTrackingEvent::data(*layoutObject)); | 1426 InspectorScrollInvalidationTrackingEvent::data(*layoutObject)); |
| 1424 | 1427 |
| 1425 layoutItem.setShouldDoFullPaintInvalidationIncludingNonCompositingDescen dants(); | |
| 1426 } | 1428 } |
| 1427 return true; | 1429 return true; |
| 1428 } | 1430 } |
| 1429 | 1431 |
| 1430 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta) | 1432 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta) |
| 1431 { | 1433 { |
| 1432 if (!contentsInCompositedLayer()) | 1434 if (!contentsInCompositedLayer()) |
| 1433 return false; | 1435 return false; |
| 1434 | 1436 |
| 1435 invalidateBackgroundAttachmentFixedObjects(); | 1437 invalidateBackgroundAttachmentFixedObjects(); |
| (...skipping 2789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4225 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); | 4227 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); |
| 4226 } | 4228 } |
| 4227 | 4229 |
| 4228 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4230 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4229 { | 4231 { |
| 4230 ASSERT(!layoutViewItem().isNull()); | 4232 ASSERT(!layoutViewItem().isNull()); |
| 4231 return *layoutView(); | 4233 return *layoutView(); |
| 4232 } | 4234 } |
| 4233 | 4235 |
| 4234 } // namespace blink | 4236 } // namespace blink |
| OLD | NEW |