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

Side by Side Diff: third_party/WebKit/Source/core/layout/ClipPathOperation.h

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 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) 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 101
102 const BasicShape* basicShape() const { return m_shape.get(); } 102 const BasicShape* basicShape() const { return m_shape.get(); }
103 bool isValid() const { return m_shape.get(); } 103 bool isValid() const { return m_shape.get(); }
104 const Path& path(const FloatRect& boundingRect) 104 const Path& path(const FloatRect& boundingRect)
105 { 105 {
106 ASSERT(m_shape); 106 ASSERT(m_shape);
107 m_path.clear(); 107 m_path.clear();
108 m_path = adoptPtr(new Path); 108 m_path = adoptPtr(new Path);
109 m_shape->path(*m_path, boundingRect); 109 m_shape->path(*m_path, boundingRect);
110 m_path->setWindRule(m_shape->windRule()); 110 m_path->setWindRule(m_shape->getWindRule());
111 return *m_path; 111 return *m_path;
112 } 112 }
113 113
114 private: 114 private:
115 bool operator==(const ClipPathOperation&) const override; 115 bool operator==(const ClipPathOperation&) const override;
116 116
117 ShapeClipPathOperation(PassRefPtr<BasicShape> shape) 117 ShapeClipPathOperation(PassRefPtr<BasicShape> shape)
118 : ClipPathOperation(SHAPE) 118 : ClipPathOperation(SHAPE)
119 , m_shape(shape) 119 , m_shape(shape)
120 { 120 {
(...skipping 11 matching lines...) Expand all
132 return false; 132 return false;
133 BasicShape* otherShape = toShapeClipPathOperation(o).m_shape.get(); 133 BasicShape* otherShape = toShapeClipPathOperation(o).m_shape.get();
134 if (!m_shape.get() || !otherShape) 134 if (!m_shape.get() || !otherShape)
135 return static_cast<bool>(m_shape.get()) == static_cast<bool>(otherShape) ; 135 return static_cast<bool>(m_shape.get()) == static_cast<bool>(otherShape) ;
136 return *m_shape == *otherShape; 136 return *m_shape == *otherShape;
137 } 137 }
138 138
139 } // namespace blink 139 } // namespace blink
140 140
141 #endif // ClipPathOperation_h 141 #endif // ClipPathOperation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698