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

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

Issue 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename layer method, add inline tests, address comments, bribe chrishtr, lather, rinse, repeat. Created 5 years 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) 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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 1005
1006 IntRect inflatedRect = pixelSnappedBorderBoxRect(); 1006 IntRect inflatedRect = pixelSnappedBorderBoxRect();
1007 LayoutTheme::theme().addVisualOverflow(*this, inflatedRect); 1007 LayoutTheme::theme().addVisualOverflow(*this, inflatedRect);
1008 addVisualOverflow(LayoutRect(inflatedRect)); 1008 addVisualOverflow(LayoutRect(inflatedRect));
1009 } 1009 }
1010 1010
1011 bool LayoutBlock::createsNewFormattingContext() const 1011 bool LayoutBlock::createsNewFormattingContext() const
1012 { 1012 {
1013 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated() 1013 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated()
1014 || style()->specifiesColumns() || isLayoutFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() 1014 || style()->specifiesColumns() || isLayoutFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot()
1015 || isDocumentElement() || isColumnSpanAll() || isGridItem(); 1015 || isDocumentElement() || isColumnSpanAll() || isGridItem() || style()-> containsPaint();
1016 } 1016 }
1017 1017
1018 void LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, L ayoutBox& child) 1018 void LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, L ayoutBox& child)
1019 { 1019 {
1020 if (child.isOutOfFlowPositioned()) { 1020 if (child.isOutOfFlowPositioned()) {
1021 // It's rather useless to mark out-of-flow children at this point. We ma y not be their 1021 // It's rather useless to mark out-of-flow children at this point. We ma y not be their
1022 // containing block (and if we are, it's just pure luck), so this would be the wrong place 1022 // containing block (and if we are, it's just pure luck), so this would be the wrong place
1023 // for it. Furthermore, it would cause trouble for out-of-flow descendan ts of column 1023 // for it. Furthermore, it would cause trouble for out-of-flow descendan ts of column
1024 // spanners, if the containing block is outside the spanner but inside t he multicol container. 1024 // spanners, if the containing block is outside the spanner but inside t he multicol container.
1025 return; 1025 return;
(...skipping 1886 matching lines...) Expand 10 before | Expand all | Expand 10 after
2912 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2912 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2913 { 2913 {
2914 showLayoutObject(); 2914 showLayoutObject();
2915 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2915 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2916 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2916 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2917 } 2917 }
2918 2918
2919 #endif 2919 #endif
2920 2920
2921 } // namespace blink 2921 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698