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

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

Issue 1581593003: Skip PaintPhaseFloat if no floats in a layer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@OutlinePhase
Patch Set: Remove test (instead of #if 0) Created 4 years, 10 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 LayoutRect rect = visualOverflowRect(); 1461 LayoutRect rect = visualOverflowRect();
1462 LayoutView* layoutView = view(); 1462 LayoutView* layoutView = view();
1463 while (layoutView->frame()->ownerLayoutObject()) 1463 while (layoutView->frame()->ownerLayoutObject())
1464 layoutView = layoutView->frame()->ownerLayoutObject()->view(); 1464 layoutView = layoutView->frame()->ownerLayoutObject()->view();
1465 mapToVisibleRectInAncestorSpace(layoutView, rect, nullptr); 1465 mapToVisibleRectInAncestorSpace(layoutView, rect, nullptr);
1466 return rect.intersects(LayoutRect(layoutView->frameView()->scrollableArea()- >visibleContentRectDouble())); 1466 return rect.intersects(LayoutRect(layoutView->frameView()->scrollableArea()- >visibleContentRectDouble()));
1467 } 1467 }
1468 1468
1469 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationStat e& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContaine r) 1469 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationStat e& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContaine r)
1470 { 1470 {
1471 if (isFloating())
1472 paintInvalidationState.enclosingSelfPaintingLayer(*this).setNeedsPaintPh aseFloat();
1473
1471 PaintInvalidationReason fullInvalidationReason = fullPaintInvalidationReason (); 1474 PaintInvalidationReason fullInvalidationReason = fullPaintInvalidationReason ();
1472 // If the current paint invalidation reason is PaintInvalidationDelayedFull, then this paint invalidation can delayed if the 1475 // If the current paint invalidation reason is PaintInvalidationDelayedFull, then this paint invalidation can delayed if the
1473 // LayoutBox in question is not on-screen. The logic to decide whether this is appropriate exists at the site of the original 1476 // LayoutBox in question is not on-screen. The logic to decide whether this is appropriate exists at the site of the original
1474 // paint invalidation that chose PaintInvalidationDelayedFull. 1477 // paint invalidation that chose PaintInvalidationDelayedFull.
1475 if (fullInvalidationReason == PaintInvalidationDelayedFull) { 1478 if (fullInvalidationReason == PaintInvalidationDelayedFull) {
1476 if (!intersectsVisibleViewport()) 1479 if (!intersectsVisibleViewport())
1477 return PaintInvalidationDelayedFull; 1480 return PaintInvalidationDelayedFull;
1478 1481
1479 // Reset state back to regular full paint invalidation if the object is onscreen. 1482 // Reset state back to regular full paint invalidation if the object is onscreen.
1480 setShouldDoFullPaintInvalidation(PaintInvalidationFull); 1483 setShouldDoFullPaintInvalidation(PaintInvalidationFull);
(...skipping 3156 matching lines...) Expand 10 before | Expand all | Expand 10 after
4637 4640
4638 void LayoutBox::clearPercentHeightDescendants() 4641 void LayoutBox::clearPercentHeightDescendants()
4639 { 4642 {
4640 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) { 4643 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) {
4641 if (curr->isBox()) 4644 if (curr->isBox())
4642 toLayoutBox(curr)->removeFromPercentHeightContainer(); 4645 toLayoutBox(curr)->removeFromPercentHeightContainer();
4643 } 4646 }
4644 } 4647 }
4645 4648
4646 } // namespace blink 4649 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698