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

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: fix merge 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 4040 matching lines...) Expand 10 before | Expand all | Expand 10 after
4051 } 4051 }
4052 4052
4053 static bool shouldBeConsideredAsReplaced(Node* node) 4053 static bool shouldBeConsideredAsReplaced(Node* node)
4054 { 4054 {
4055 // Checkboxes and radioboxes are not isAtomicInlineLevel() nor do they have their own layoutObject in which to override avoidFloats(). 4055 // Checkboxes and radioboxes are not isAtomicInlineLevel() nor do they have their own layoutObject in which to override avoidFloats().
4056 return node && node->isElementNode() && (toElement(node)->isFormControlEleme nt() || isHTMLImageElement(toElement(node))); 4056 return node && node->isElementNode() && (toElement(node)->isFormControlEleme nt() || isHTMLImageElement(toElement(node)));
4057 } 4057 }
4058 4058
4059 bool LayoutBox::avoidsFloats() const 4059 bool LayoutBox::avoidsFloats() const
4060 { 4060 {
4061 return isAtomicInlineLevel() || shouldBeConsideredAsReplaced(node()) || hasO verflowClip() || isHR() || isLegend() || isWritingModeRoot() || isFlexItemInclud ingDeprecated(); 4061 return isAtomicInlineLevel() || shouldBeConsideredAsReplaced(node()) || hasO verflowClip() || isHR() || isLegend() || isWritingModeRoot() || isFlexItemInclud ingDeprecated() || style()->containsPaint();
4062 } 4062 }
4063 4063
4064 bool LayoutBox::hasNonCompositedScrollbars() const 4064 bool LayoutBox::hasNonCompositedScrollbars() const
4065 { 4065 {
4066 if (PaintLayer* layer = this->layer()) { 4066 if (PaintLayer* layer = this->layer()) {
4067 if (PaintLayerScrollableArea* scrollableArea = layer->scrollableArea()) { 4067 if (PaintLayerScrollableArea* scrollableArea = layer->scrollableArea()) {
4068 if (scrollableArea->hasHorizontalScrollbar() && !scrollableArea->lay erForHorizontalScrollbar()) 4068 if (scrollableArea->hasHorizontalScrollbar() && !scrollableArea->lay erForHorizontalScrollbar())
4069 return true; 4069 return true;
4070 if (scrollableArea->hasVerticalScrollbar() && !scrollableArea->layer ForVerticalScrollbar()) 4070 if (scrollableArea->hasVerticalScrollbar() && !scrollableArea->layer ForVerticalScrollbar())
4071 return true; 4071 return true;
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
4913 } 4913 }
4914 4914
4915 void LayoutBox::clearPreviousPaintInvalidationRects() 4915 void LayoutBox::clearPreviousPaintInvalidationRects()
4916 { 4916 {
4917 LayoutBoxModelObject::clearPreviousPaintInvalidationRects(); 4917 LayoutBoxModelObject::clearPreviousPaintInvalidationRects();
4918 if (PaintLayerScrollableArea* scrollableArea = this->scrollableArea()) 4918 if (PaintLayerScrollableArea* scrollableArea = this->scrollableArea())
4919 scrollableArea->clearPreviousPaintInvalidationRects(); 4919 scrollableArea->clearPreviousPaintInvalidationRects();
4920 } 4920 }
4921 4921
4922 } // namespace blink 4922 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698