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

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

Issue 2692853016: Change PaintLayer::m_layoutObject to a reference. (Closed)
Patch Set: Added TODO Created 3 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
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. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 setShouldDoFullPaintInvalidation(PaintInvalidationFull); 1770 setShouldDoFullPaintInvalidation(PaintInvalidationFull);
1771 } 1771 }
1772 } 1772 }
1773 1773
1774 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded( 1774 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(
1775 const PaintInvalidationState& paintInvalidationState) { 1775 const PaintInvalidationState& paintInvalidationState) {
1776 if (hasBoxDecorationBackground() 1776 if (hasBoxDecorationBackground()
1777 // We also paint overflow controls in background phase. 1777 // We also paint overflow controls in background phase.
1778 || (hasOverflowClip() && getScrollableArea()->hasOverflowControls())) { 1778 || (hasOverflowClip() && getScrollableArea()->hasOverflowControls())) {
1779 PaintLayer& layer = paintInvalidationState.paintingLayer(); 1779 PaintLayer& layer = paintInvalidationState.paintingLayer();
1780 if (layer.layoutObject() != this) 1780 if (&layer.layoutObject() != this)
1781 layer.setNeedsPaintPhaseDescendantBlockBackgrounds(); 1781 layer.setNeedsPaintPhaseDescendantBlockBackgrounds();
1782 } 1782 }
1783 1783
1784 return LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState); 1784 return LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState);
1785 } 1785 }
1786 1786
1787 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded( 1787 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(
1788 const PaintInvalidatorContext& context) const { 1788 const PaintInvalidatorContext& context) const {
1789 return BoxPaintInvalidator(*this, context).invalidatePaintIfNeeded(); 1789 return BoxPaintInvalidator(*this, context).invalidatePaintIfNeeded();
1790 } 1790 }
(...skipping 3923 matching lines...) Expand 10 before | Expand all | Expand 10 after
5714 block->adjustChildDebugRect(rect); 5714 block->adjustChildDebugRect(rect);
5715 5715
5716 return rect; 5716 return rect;
5717 } 5717 }
5718 5718
5719 bool LayoutBox::shouldClipOverflow() const { 5719 bool LayoutBox::shouldClipOverflow() const {
5720 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip(); 5720 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
5721 } 5721 }
5722 5722
5723 } // namespace blink 5723 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698