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

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

Issue 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: additional rename, fix search/replace 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) 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 3997 matching lines...) Expand 10 before | Expand all | Expand 10 after
4008 } 4008 }
4009 4009
4010 static bool shouldBeConsideredAsReplaced(Node* node) 4010 static bool shouldBeConsideredAsReplaced(Node* node)
4011 { 4011 {
4012 // Checkboxes and radioboxes are not isAtomicInlineLevel() nor do they have their own layoutObject in which to override avoidFloats(). 4012 // Checkboxes and radioboxes are not isAtomicInlineLevel() nor do they have their own layoutObject in which to override avoidFloats().
4013 return node && node->isElementNode() && (toElement(node)->isFormControlEleme nt() || isHTMLImageElement(toElement(node))); 4013 return node && node->isElementNode() && (toElement(node)->isFormControlEleme nt() || isHTMLImageElement(toElement(node)));
4014 } 4014 }
4015 4015
4016 bool LayoutBox::avoidsFloats() const 4016 bool LayoutBox::avoidsFloats() const
4017 { 4017 {
4018 return isAtomicInlineLevel() || shouldBeConsideredAsReplaced(node()) || hasO verflowClip() || isHR() || isLegend() || isWritingModeRoot() || isFlexItemInclud ingDeprecated(); 4018 return isAtomicInlineLevel() || shouldBeConsideredAsReplaced(node()) || hasO verflowClip() || isHR() || isLegend() || isWritingModeRoot() || isFlexItemInclud ingDeprecated() || style()->containsPaint();
4019 } 4019 }
4020 4020
4021 bool LayoutBox::hasNonCompositedScrollbars() const 4021 bool LayoutBox::hasNonCompositedScrollbars() const
4022 { 4022 {
4023 if (PaintLayer* layer = this->layer()) { 4023 if (PaintLayer* layer = this->layer()) {
4024 if (PaintLayerScrollableArea* scrollableArea = layer->scrollableArea()) { 4024 if (PaintLayerScrollableArea* scrollableArea = layer->scrollableArea()) {
4025 if (scrollableArea->hasHorizontalScrollbar() && !scrollableArea->lay erForHorizontalScrollbar()) 4025 if (scrollableArea->hasHorizontalScrollbar() && !scrollableArea->lay erForHorizontalScrollbar())
4026 return true; 4026 return true;
4027 if (scrollableArea->hasVerticalScrollbar() && !scrollableArea->layer ForVerticalScrollbar()) 4027 if (scrollableArea->hasVerticalScrollbar() && !scrollableArea->layer ForVerticalScrollbar())
4028 return true; 4028 return true;
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
4870 } 4870 }
4871 4871
4872 void LayoutBox::clearPreviousPaintInvalidationRects() 4872 void LayoutBox::clearPreviousPaintInvalidationRects()
4873 { 4873 {
4874 LayoutBoxModelObject::clearPreviousPaintInvalidationRects(); 4874 LayoutBoxModelObject::clearPreviousPaintInvalidationRects();
4875 if (PaintLayerScrollableArea* scrollableArea = this->scrollableArea()) 4875 if (PaintLayerScrollableArea* scrollableArea = this->scrollableArea())
4876 scrollableArea->clearPreviousPaintInvalidationRects(); 4876 scrollableArea->clearPreviousPaintInvalidationRects();
4877 } 4877 }
4878 4878
4879 } // namespace blink 4879 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698