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

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

Issue 273043002: Don't use pageLogicalHeight() to resolve percentage values in subframes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@mixed-case-selector
Patch Set: Set a fixed body height to work around rounding issue on mac; also add a title to the test to descr… Created 6 years, 7 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 * 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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 void shrinkToFitWidth(const LayoutUnit availableSpace, const LayoutUnit logi calLeftValue, const LayoutUnit bordersPlusPadding, LogicalExtentComputedValues&) const; 672 void shrinkToFitWidth(const LayoutUnit availableSpace, const LayoutUnit logi calLeftValue, const LayoutUnit bordersPlusPadding, LogicalExtentComputedValues&) const;
673 673
674 // Returns true if we did a full repaint 674 // Returns true if we did a full repaint
675 bool repaintLayerRectsForImage(WrappedImagePtr image, const FillLayer* layer s, bool drawingBackground); 675 bool repaintLayerRectsForImage(WrappedImagePtr image, const FillLayer* layer s, bool drawingBackground);
676 676
677 bool skipContainingBlockForPercentHeightCalculation(const RenderBox* contain ingBlock) const; 677 bool skipContainingBlockForPercentHeightCalculation(const RenderBox* contain ingBlock) const;
678 678
679 LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObje ct* containingBlock, bool checkForPerpendicularWritingMode = true) const; 679 LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObje ct* containingBlock, bool checkForPerpendicularWritingMode = true) const;
680 LayoutUnit containingBlockLogicalHeightForPositioned(const RenderBoxModelObj ect* containingBlock, bool checkForPerpendicularWritingMode = true) const; 680 LayoutUnit containingBlockLogicalHeightForPositioned(const RenderBoxModelObj ect* containingBlock, bool checkForPerpendicularWritingMode = true) const;
681 681
682 LayoutUnit viewLogicalHeightForPercentages() const;
683
684 void computePositionedLogicalHeight(LogicalExtentComputedValues&) const; 682 void computePositionedLogicalHeight(LogicalExtentComputedValues&) const;
685 void computePositionedLogicalWidthUsing(Length logicalWidth, const RenderBox ModelObject* containerBlock, TextDirection containerDirection, 683 void computePositionedLogicalWidthUsing(Length logicalWidth, const RenderBox ModelObject* containerBlock, TextDirection containerDirection,
686 LayoutUnit containerLogicalWidth, La youtUnit bordersPlusPadding, 684 LayoutUnit containerLogicalWidth, La youtUnit bordersPlusPadding,
687 Length logicalLeft, Length logicalRi ght, Length marginLogicalLeft, Length marginLogicalRight, 685 Length logicalLeft, Length logicalRi ght, Length marginLogicalLeft, Length marginLogicalRight,
688 LogicalExtentComputedValues&) const; 686 LogicalExtentComputedValues&) const;
689 void computePositionedLogicalHeightUsing(Length logicalHeightLength, const R enderBoxModelObject* containerBlock, 687 void computePositionedLogicalHeightUsing(Length logicalHeightLength, const R enderBoxModelObject* containerBlock,
690 LayoutUnit containerLogicalHeight, LayoutUnit bordersPlusPadding, LayoutUnit logicalHeight, 688 LayoutUnit containerLogicalHeight, LayoutUnit bordersPlusPadding, LayoutUnit logicalHeight,
691 Length logicalTop, Length logicalBo ttom, Length marginLogicalTop, Length marginLogicalBottom, 689 Length logicalTop, Length logicalBo ttom, Length marginLogicalTop, Length marginLogicalBottom,
692 LogicalExtentComputedValues&) const ; 690 LogicalExtentComputedValues&) const ;
693 691
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 if (UNLIKELY(inlineBoxWrapper() != 0)) 774 if (UNLIKELY(inlineBoxWrapper() != 0))
777 deleteLineBoxWrapper(); 775 deleteLineBoxWrapper();
778 } 776 }
779 777
780 ensureRareData().m_inlineBoxWrapper = boxWrapper; 778 ensureRareData().m_inlineBoxWrapper = boxWrapper;
781 } 779 }
782 780
783 } // namespace WebCore 781 } // namespace WebCore
784 782
785 #endif // RenderBox_h 783 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « LayoutTests/printing/subframes-percentage-height-expected.html ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698