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

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

Issue 176953008: Include the outline into the visual overflow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed dumb bug caught by Mac. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 void addLayoutOverflow(const LayoutRect&); 224 void addLayoutOverflow(const LayoutRect&);
225 void addVisualOverflow(const LayoutRect&); 225 void addVisualOverflow(const LayoutRect&);
226 226
227 // Clipped by the contents clip, if one exists. 227 // Clipped by the contents clip, if one exists.
228 void addContentsVisualOverflow(const LayoutRect&); 228 void addContentsVisualOverflow(const LayoutRect&);
229 229
230 void addVisualEffectOverflow(); 230 void addVisualEffectOverflow();
231 void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, ch ild->locationOffset()); } 231 void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, ch ild->locationOffset()); }
232 void addOverflowFromChild(RenderBox* child, const LayoutSize& delta); 232 void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
233 void clearLayoutOverflow(); 233 void clearLayoutOverflow();
234 void clearAllOverflows() { m_overflow.clear(); }
234 235
235 void updateLayerTransform(); 236 void updateLayerTransform();
236 237
237 LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - pad dingRight(); } 238 LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - pad dingRight(); }
238 LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - pa ddingBottom(); } 239 LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - pa ddingBottom(); }
239 LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWriting Mode() ? contentWidth() : contentHeight(); } 240 LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWriting Mode() ? contentWidth() : contentHeight(); }
240 LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritin gMode() ? contentHeight() : contentWidth(); } 241 LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritin gMode() ? contentHeight() : contentWidth(); }
241 242
242 // IE extensions. Used to calculate offsetWidth/Height. Overridden by inlin es (RenderFlow) 243 // IE extensions. Used to calculate offsetWidth/Height. Overridden by inlin es (RenderFlow)
243 // to return the remaining width on a given line (and the height of a single line). 244 // to return the remaining width on a given line (and the height of a single line).
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 if (UNLIKELY(inlineBoxWrapper() != 0)) 776 if (UNLIKELY(inlineBoxWrapper() != 0))
776 deleteLineBoxWrapper(); 777 deleteLineBoxWrapper();
777 } 778 }
778 779
779 ensureRareData().m_inlineBoxWrapper = boxWrapper; 780 ensureRareData().m_inlineBoxWrapper = boxWrapper;
780 } 781 }
781 782
782 } // namespace WebCore 783 } // namespace WebCore
783 784
784 #endif // RenderBox_h 785 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698