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

Side by Side Diff: Source/core/layout/LayoutBox.h

Issue 1036653002: Clamp shape-margin to zero (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove squashed patch Created 5 years, 8 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 void addVisualEffectOverflow(); 279 void addVisualEffectOverflow();
280 LayoutRectOutsets computeVisualEffectOverflowOutsets() const; 280 LayoutRectOutsets computeVisualEffectOverflowOutsets() const;
281 void addOverflowFromChild(LayoutBox* child) { addOverflowFromChild(child, ch ild->locationOffset()); } 281 void addOverflowFromChild(LayoutBox* child) { addOverflowFromChild(child, ch ild->locationOffset()); }
282 void addOverflowFromChild(LayoutBox* child, const LayoutSize& delta); 282 void addOverflowFromChild(LayoutBox* child, const LayoutSize& delta);
283 void clearLayoutOverflow(); 283 void clearLayoutOverflow();
284 void clearAllOverflows() { m_overflow.clear(); } 284 void clearAllOverflows() { m_overflow.clear(); }
285 285
286 void updateLayerTransformAfterLayout(); 286 void updateLayerTransformAfterLayout();
287 287
288 LayoutUnit contentWidthExcludingScrollbar() const { return m_frameRect.width () - borderLeft() - borderRight() - paddingLeft() - paddingRight(); }
288 LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - pad dingRight(); } 289 LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - pad dingRight(); }
289 LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - pa ddingBottom(); } 290 LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - pa ddingBottom(); }
290 LayoutSize contentSize() const { return LayoutSize(contentWidth(), contentHe ight()); } 291 LayoutSize contentSize() const { return LayoutSize(contentWidth(), contentHe ight()); }
291 LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWriting Mode() ? contentWidth() : contentHeight(); } 292 LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWriting Mode() ? contentWidth() : contentHeight(); }
292 LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritin gMode() ? contentHeight() : contentWidth(); } 293 LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritin gMode() ? contentHeight() : contentWidth(); }
293 294
294 // IE extensions. Used to calculate offsetWidth/Height. Overridden by inlin es (RenderFlow) 295 // IE extensions. Used to calculate offsetWidth/Height. Overridden by inlin es (RenderFlow)
295 // to return the remaining width on a given line (and the height of a single line). 296 // to return the remaining width on a given line (and the height of a single line).
296 virtual LayoutUnit offsetWidth() const override { return m_frameRect.width() ; } 297 virtual LayoutUnit offsetWidth() const override { return m_frameRect.width() ; }
297 virtual LayoutUnit offsetHeight() const override { return m_frameRect.height (); } 298 virtual LayoutUnit offsetHeight() const override { return m_frameRect.height (); }
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 if (UNLIKELY(inlineBoxWrapper() != 0)) 920 if (UNLIKELY(inlineBoxWrapper() != 0))
920 deleteLineBoxWrapper(); 921 deleteLineBoxWrapper();
921 } 922 }
922 923
923 ensureRareData().m_inlineBoxWrapper = boxWrapper; 924 ensureRareData().m_inlineBoxWrapper = boxWrapper;
924 } 925 }
925 926
926 } // namespace blink 927 } // namespace blink
927 928
928 #endif // LayoutBox_h 929 #endif // LayoutBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698