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

Unified Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/style/RenderStyle.h
diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
index cbe16b12576fab869e05ebc4169345f70807041a..3e64a061bb8b4acd2fedea5bff61ce2eaef3451d 100644
--- a/sky/engine/core/rendering/style/RenderStyle.h
+++ b/sky/engine/core/rendering/style/RenderStyle.h
@@ -1195,16 +1195,6 @@ public:
bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareNonInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(rareNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
- void setShapeOutside(PassRefPtr<ShapeValue> value)
- {
- if (rareNonInheritedData->m_shapeOutside == value)
- return;
- rareNonInheritedData.access()->m_shapeOutside = value;
- }
- ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
-
- static ShapeValue* initialShapeOutside() { return 0; }
-
void setClipPath(PassRefPtr<ClipPathOperation> operation)
{
if (rareNonInheritedData->m_clipPath != operation)
@@ -1214,18 +1204,6 @@ public:
static ClipPathOperation* initialClipPath() { return 0; }
- const Length& shapeMargin() const { return rareNonInheritedData->m_shapeMargin; }
- void setShapeMargin(const Length& shapeMargin) { SET_VAR(rareNonInheritedData, m_shapeMargin, shapeMargin); }
- static Length initialShapeMargin() { return Length(0, Fixed); }
-
- float shapeImageThreshold() const { return rareNonInheritedData->m_shapeImageThreshold; }
- void setShapeImageThreshold(float shapeImageThreshold)
- {
- float clampedShapeImageThreshold = clampTo<float>(shapeImageThreshold, 0, 1);
- SET_VAR(rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageThreshold);
- }
- static float initialShapeImageThreshold() { return 0; }
-
bool hasContent() const { return contentData(); }
const ContentData* contentData() const { return rareNonInheritedData->m_content.get(); }
bool contentDataEquivalent(const RenderStyle* otherStyle) const { return const_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_cast<RenderStyle*>(otherStyle)->rareNonInheritedData); }
« no previous file with comments | « sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698