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

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

Issue 185723005: Use correct container width as base for percentage margins. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 }; 382 };
383 struct LogicalExtentComputedValues { 383 struct LogicalExtentComputedValues {
384 LogicalExtentComputedValues() { } 384 LogicalExtentComputedValues() { }
385 385
386 LayoutUnit m_extent; 386 LayoutUnit m_extent;
387 LayoutUnit m_position; 387 LayoutUnit m_position;
388 ComputedMarginValues m_margins; 388 ComputedMarginValues m_margins;
389 }; 389 };
390 // Resolve auto margins in the inline direction of the containing block so t hat objects can be pushed to the start, middle or end 390 // Resolve auto margins in the inline direction of the containing block so t hat objects can be pushed to the start, middle or end
391 // of the containing block. 391 // of the containing block.
392 void computeInlineDirectionMargins(RenderBlock* containingBlock, LayoutUnit containerWidth, LayoutUnit childWidth, LayoutUnit& marginStart, LayoutUnit& marg inEnd) const; 392 void computeInlineDirectionMargins(RenderBlock* containingBlock, LayoutUnit containerWidth, LayoutUnit availableWidth, LayoutUnit childWidth, LayoutUnit& ma rginStart, LayoutUnit& marginEnd) const;
393 393
394 // Used to resolve margins in the containing block's block-flow direction. 394 // Used to resolve margins in the containing block's block-flow direction.
395 void computeBlockDirectionMargins(const RenderBlock* containingBlock, Layout Unit& marginBefore, LayoutUnit& marginAfter) const; 395 void computeBlockDirectionMargins(const RenderBlock* containingBlock, Layout Unit& marginBefore, LayoutUnit& marginAfter) const;
396 void computeAndSetBlockDirectionMargins(const RenderBlock* containingBlock); 396 void computeAndSetBlockDirectionMargins(const RenderBlock* containingBlock);
397 397
398 virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const; 398 virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const;
399 399
400 void positionLineBox(InlineBox*); 400 void positionLineBox(InlineBox*);
401 401
402 virtual InlineBox* createInlineBox(); 402 virtual InlineBox* createInlineBox();
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 if (UNLIKELY(inlineBoxWrapper() != 0)) 774 if (UNLIKELY(inlineBoxWrapper() != 0))
775 deleteLineBoxWrapper(); 775 deleteLineBoxWrapper();
776 } 776 }
777 777
778 ensureRareData().m_inlineBoxWrapper = boxWrapper; 778 ensureRareData().m_inlineBoxWrapper = boxWrapper;
779 } 779 }
780 780
781 } // namespace WebCore 781 } // namespace WebCore
782 782
783 #endif // RenderBox_h 783 #endif // RenderBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698