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

Side by Side Diff: Source/core/rendering/exclusions/ExclusionRectangle.h

Issue 14892005: [CSS Exclusions] ExclusionShape bounding box methods should return LayoutRects (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: reverted LineSegment logicalLeft,Right type change Created 7 years, 7 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class ExclusionRectangle : public ExclusionShape { 61 class ExclusionRectangle : public ExclusionShape {
62 public: 62 public:
63 ExclusionRectangle(const FloatRect& bounds, const FloatSize& radii) 63 ExclusionRectangle(const FloatRect& bounds, const FloatSize& radii)
64 : ExclusionShape() 64 : ExclusionShape()
65 , m_bounds(bounds, radii) 65 , m_bounds(bounds, radii)
66 , m_haveInitializedMarginBounds(false) 66 , m_haveInitializedMarginBounds(false)
67 , m_haveInitializedPaddingBounds(false) 67 , m_haveInitializedPaddingBounds(false)
68 { 68 {
69 } 69 }
70 70
71 virtual FloatRect shapeMarginLogicalBoundingBox() const OVERRIDE { return sh apeMarginBounds(); } 71 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); }
72 virtual FloatRect shapePaddingLogicalBoundingBox() const OVERRIDE { return s hapePaddingBounds(); } 72 virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(shapePaddingBounds()); }
73 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); } 73 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); }
74 virtual void getExcludedIntervals(float logicalTop, float logicalHeight, Seg mentList&) const OVERRIDE; 74 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;
75 virtual void getIncludedIntervals(float logicalTop, float logicalHeight, Seg mentList&) const OVERRIDE; 75 virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;
76 virtual bool firstIncludedIntervalLogicalTop(float minLogicalIntervalTop, co nst FloatSize& minLogicalIntervalSize, float&) const OVERRIDE; 76 virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTo p, const LayoutSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;
77 77
78 private:
78 FloatRoundedRect shapeMarginBounds() const; 79 FloatRoundedRect shapeMarginBounds() const;
79 FloatRoundedRect shapePaddingBounds() const; 80 FloatRoundedRect shapePaddingBounds() const;
80 81
81 private:
82 FloatRoundedRect m_bounds; 82 FloatRoundedRect m_bounds;
83 mutable FloatRoundedRect m_marginBounds; 83 mutable FloatRoundedRect m_marginBounds;
84 mutable FloatRoundedRect m_paddingBounds; 84 mutable FloatRoundedRect m_paddingBounds;
85 mutable bool m_haveInitializedMarginBounds : 1; 85 mutable bool m_haveInitializedMarginBounds : 1;
86 mutable bool m_haveInitializedPaddingBounds : 1; 86 mutable bool m_haveInitializedPaddingBounds : 1;
87 }; 87 };
88 88
89 } // namespace WebCore 89 } // namespace WebCore
90 90
91 #endif // ExclusionRectangle_h 91 #endif // ExclusionRectangle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/exclusions/ExclusionPolygon.cpp ('k') | Source/core/rendering/exclusions/ExclusionRectangle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698