Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositingRequirementsUpdater.cpp

Issue 2382563002: Revert changes is the use of CompositingReasonOutOfFlowClipping
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Google Inc. All rights reserved. 3 * Copyright (C) 2014 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 } 272 }
273 if (layer->scrollsWithRespectTo(unclippedDescendant)) 273 if (layer->scrollsWithRespectTo(unclippedDescendant))
274 reasonsToComposite |= CompositingReasonAssumedOverlap; 274 reasonsToComposite |= CompositingReasonAssumedOverlap;
275 } 275 }
276 276
277 // Remove irrelevant unclipped descendants in reverse order so our store d 277 // Remove irrelevant unclipped descendants in reverse order so our store d
278 // indices remain valid. 278 // indices remain valid.
279 for (size_t i = 0; i < unclippedDescendantsToRemove.size(); i++) 279 for (size_t i = 0; i < unclippedDescendantsToRemove.size(); i++)
280 unclippedDescendants.remove(unclippedDescendantsToRemove.at(unclippe dDescendantsToRemove.size() - i - 1)); 280 unclippedDescendants.remove(unclippedDescendantsToRemove.at(unclippe dDescendantsToRemove.size() - i - 1));
281 281
282 if (layer->clipParent()) { 282 if (reasonsToComposite & CompositingReasonOutOfFlowClipping) {
283 // TODO(schenney): We only need to promote when the clipParent is no t a descendant of the ancestor scroller, 283 // TODO(schenney): We only need to promote when the clipParent is no t a descendant of the ancestor scroller,
284 // which we do not check for here. Hence we might be promoting needl essly. 284 // which we do not check for here. Hence we might be promoting needl essly.
285 unclippedDescendants.append(layer); 285 unclippedDescendants.append(layer);
286 } 286 }
287 } 287 }
288 288
289 const IntRect& absBounds = layer->clippedAbsoluteBoundingBox(); 289 const IntRect& absBounds = layer->clippedAbsoluteBoundingBox();
290 absoluteDescendantBoundingBox = absBounds; 290 absoluteDescendantBoundingBox = absBounds;
291 291
292 if (currentRecursionData.m_testingOverlap && !requiresCompositingOrSquashing (directReasons)) 292 if (currentRecursionData.m_testingOverlap && !requiresCompositingOrSquashing (directReasons))
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 overlapMap.finishCurrentOverlapTestingContext(); 447 overlapMap.finishCurrentOverlapTestingContext();
448 448
449 descendantHas3DTransform |= anyDescendantHas3DTransform || layer->has3DT ransform(); 449 descendantHas3DTransform |= anyDescendantHas3DTransform || layer->has3DT ransform();
450 } 450 }
451 451
452 // At this point we have finished collecting all reasons to composite this l ayer. 452 // At this point we have finished collecting all reasons to composite this l ayer.
453 layer->setCompositingReasons(reasonsToComposite); 453 layer->setCompositingReasons(reasonsToComposite);
454 } 454 }
455 455
456 } // namespace blink 456 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698