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

Side by Side Diff: Source/core/rendering/RenderBox.h

Issue 433603004: Disentangle repaint-after-compositing from updateLayerPositionsAfterLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 676
677 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const OVERRIDE; 677 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const OVERRIDE;
678 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE; 678 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE;
679 679
680 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; } 680 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
681 681
682 virtual InvalidationReason getPaintInvalidationReason(const RenderLayerModel Object& paintInvalidationContainer, 682 virtual InvalidationReason getPaintInvalidationReason(const RenderLayerModel Object& paintInvalidationContainer,
683 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva lidationContainer, 683 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva lidationContainer,
684 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva lidationContainer) OVERRIDE; 684 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva lidationContainer) OVERRIDE;
685 685
686 virtual void clearPaintInvalidationState() OVERRIDE; 686 virtual void clearPaintInvalidationState(const PaintInvalidationState&) OVER RIDE;
687 #if ENABLE(ASSERT) 687 #if ENABLE(ASSERT)
688 virtual bool paintInvalidationStateIsDirty() const OVERRIDE; 688 virtual bool paintInvalidationStateIsDirty() const OVERRIDE;
689 #endif 689 #endif
690 690
691 private: 691 private:
692 void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const Render Style* oldStyle); 692 void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const Render Style* oldStyle);
693 void updateGridPositionAfterStyleChange(const RenderStyle*); 693 void updateGridPositionAfterStyleChange(const RenderStyle*);
694 694
695 bool autoWidthShouldFitContent() const; 695 bool autoWidthShouldFitContent() const;
696 void shrinkToFitWidth(const LayoutUnit availableSpace, const LayoutUnit logi calLeftValue, const LayoutUnit bordersPlusPadding, LogicalExtentComputedValues&) const; 696 void shrinkToFitWidth(const LayoutUnit availableSpace, const LayoutUnit logi calLeftValue, const LayoutUnit bordersPlusPadding, LogicalExtentComputedValues&) const;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 RenderBoxRareData& ensureRareData() 729 RenderBoxRareData& ensureRareData()
730 { 730 {
731 if (!m_rareData) 731 if (!m_rareData)
732 m_rareData = adoptPtr(new RenderBoxRareData()); 732 m_rareData = adoptPtr(new RenderBoxRareData());
733 return *m_rareData.get(); 733 return *m_rareData.get();
734 } 734 }
735 735
736 void savePreviousBorderBoxSizeIfNeeded(); 736 void savePreviousBorderBoxSizeIfNeeded();
737 bool logicalHeightComputesAsNone(SizeType) const; 737 bool logicalHeightComputesAsNone(SizeType) const;
738 738
739 void invalidatePaintIfNeeded(const PaintInvalidationState&, const RenderLaye rModelObject& newPaintInvalidationContainer); 739 InvalidationReason invalidatePaintIfNeeded(const PaintInvalidationState&, co nst RenderLayerModelObject& newPaintInvalidationContainer);
740 740
741 bool isBox() const WTF_DELETED_FUNCTION; // This will catch anyone doing an unnecessary check. 741 bool isBox() const WTF_DELETED_FUNCTION; // This will catch anyone doing an unnecessary check.
742 742
743 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). 743 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent).
744 LayoutRect m_frameRect; 744 LayoutRect m_frameRect;
745 745
746 // Our intrinsic height, used for min-height: min-content etc. Maintained by 746 // Our intrinsic height, used for min-height: min-content etc. Maintained by
747 // updateLogicalHeight. This is logicalHeight() before it is clamped to 747 // updateLogicalHeight. This is logicalHeight() before it is clamped to
748 // min/max. 748 // min/max.
749 mutable LayoutUnit m_intrinsicContentLogicalHeight; 749 mutable LayoutUnit m_intrinsicContentLogicalHeight;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 if (UNLIKELY(inlineBoxWrapper() != 0)) 802 if (UNLIKELY(inlineBoxWrapper() != 0))
803 deleteLineBoxWrapper(); 803 deleteLineBoxWrapper();
804 } 804 }
805 805
806 ensureRareData().m_inlineBoxWrapper = boxWrapper; 806 ensureRareData().m_inlineBoxWrapper = boxWrapper;
807 } 807 }
808 808
809 } // namespace blink 809 } // namespace blink
810 810
811 #endif // RenderBox_h 811 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698