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

Side by Side Diff: Source/core/rendering/shapes/RectangleShape.h

Issue 216793009: Remove shape-padding (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove m_padding Created 6 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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class RectangleShape FINAL : public Shape { 42 class RectangleShape FINAL : public Shape {
43 public: 43 public:
44 RectangleShape(const FloatRect& bounds, const FloatSize& radii) 44 RectangleShape(const FloatRect& bounds, const FloatSize& radii)
45 : Shape() 45 : Shape()
46 , m_bounds(bounds) 46 , m_bounds(bounds)
47 , m_radii(radii) 47 , m_radii(radii)
48 { 48 {
49 } 49 }
50 50
51 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); } 51 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); }
52 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(shapePaddingBounds()); }
53 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); } 52 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); }
54 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE; 53 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;
55 virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;
56 virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTo p, const FloatSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;
57 54
58 private: 55 private:
59 FloatRect shapeMarginBounds() const; 56 FloatRect shapeMarginBounds() const;
60 FloatRect shapePaddingBounds() const;
61 57
62 float rx() const { return m_radii.width(); } 58 float rx() const { return m_radii.width(); }
63 float ry() const { return m_radii.height(); } 59 float ry() const { return m_radii.height(); }
64 float x() const { return m_bounds.x(); } 60 float x() const { return m_bounds.x(); }
65 float y() const { return m_bounds.y(); } 61 float y() const { return m_bounds.y(); }
66 float width() const { return m_bounds.width(); } 62 float width() const { return m_bounds.width(); }
67 float height() const { return m_bounds.height(); } 63 float height() const { return m_bounds.height(); }
68 64
69 FloatRect m_bounds; 65 FloatRect m_bounds;
70 FloatSize m_radii; 66 FloatSize m_radii;
71 }; 67 };
72 68
73 } // namespace WebCore 69 } // namespace WebCore
74 70
75 #endif // RectangleShape_h 71 #endif // RectangleShape_h
OLDNEW
« no previous file with comments | « Source/core/rendering/shapes/RasterShape.cpp ('k') | Source/core/rendering/shapes/RectangleShape.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698