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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/RenderBlockLineLayout.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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 bool shrinkToAvoidFloats() const; 536 bool shrinkToAvoidFloats() const;
537 virtual bool avoidsFloats() const; 537 virtual bool avoidsFloats() const;
538 538
539 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&); 539 virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&);
540 540
541 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); } 541 bool isWritingModeRoot() const { return !parent() || parent()->style()->writ ingMode() != style()->writingMode(); }
542 542
543 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); } 543 bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOf FlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); }
544 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); } 544 bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloati ngOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDepreca ted(); }
545 545
546 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const OVERRIDE; 546 virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const OVERRIDE;
547 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 547 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
548 548
549 virtual LayoutUnit offsetLeft() const OVERRIDE; 549 virtual LayoutUnit offsetLeft() const OVERRIDE;
550 virtual LayoutUnit offsetTop() const OVERRIDE; 550 virtual LayoutUnit offsetTop() const OVERRIDE;
551 551
552 LayoutPoint flipForWritingModeForChild(const RenderBox* child, const LayoutP oint&) const; 552 LayoutPoint flipForWritingModeForChild(const RenderBox* child, const LayoutP oint&) const;
553 LayoutUnit flipForWritingMode(LayoutUnit position) const; // The offset is i n the block direction (y for horizontal writing modes, x for vertical writing mo des). 553 LayoutUnit flipForWritingMode(LayoutUnit position) const; // The offset is i n the block direction (y for horizontal writing modes, x for vertical writing mo des).
554 LayoutPoint flipForWritingMode(const LayoutPoint&) const; 554 LayoutPoint flipForWritingMode(const LayoutPoint&) const;
555 LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const; 555 LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
556 LayoutSize flipForWritingMode(const LayoutSize&) const; 556 LayoutSize flipForWritingMode(const LayoutSize&) const;
557 void flipForWritingMode(LayoutRect&) const; 557 void flipForWritingMode(LayoutRect&) const;
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 if (UNLIKELY(inlineBoxWrapper() != 0)) 775 if (UNLIKELY(inlineBoxWrapper() != 0))
776 deleteLineBoxWrapper(); 776 deleteLineBoxWrapper();
777 } 777 }
778 778
779 ensureRareData().m_inlineBoxWrapper = boxWrapper; 779 ensureRareData().m_inlineBoxWrapper = boxWrapper;
780 } 780 }
781 781
782 } // namespace WebCore 782 } // namespace WebCore
783 783
784 #endif // RenderBox_h 784 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockLineLayout.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698