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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); } 1188 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); }
1189 1189
1190 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); } 1190 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); }
1191 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()-> m_willChange, m_contents, b); } 1191 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()-> m_willChange, m_contents, b); }
1192 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce ss()->m_willChange, m_scrollPosition, b); } 1192 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce ss()->m_willChange, m_scrollPosition, b); }
1193 void setSubtreeWillChangeContents(bool b) { SET_VAR(rareInheritedData, m_sub treeWillChangeContents, b); } 1193 void setSubtreeWillChangeContents(bool b) { SET_VAR(rareInheritedData, m_sub treeWillChangeContents, b); }
1194 1194
1195 bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareN onInheritedData->m_requiresAcceleratedCompositingForExternalReasons; } 1195 bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareN onInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
1196 void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(r areNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); } 1196 void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(r areNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
1197 1197
1198 void setShapeOutside(PassRefPtr<ShapeValue> value)
1199 {
1200 if (rareNonInheritedData->m_shapeOutside == value)
1201 return;
1202 rareNonInheritedData.access()->m_shapeOutside = value;
1203 }
1204 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutsi de.get(); }
1205
1206 static ShapeValue* initialShapeOutside() { return 0; }
1207
1208 void setClipPath(PassRefPtr<ClipPathOperation> operation) 1198 void setClipPath(PassRefPtr<ClipPathOperation> operation)
1209 { 1199 {
1210 if (rareNonInheritedData->m_clipPath != operation) 1200 if (rareNonInheritedData->m_clipPath != operation)
1211 rareNonInheritedData.access()->m_clipPath = operation; 1201 rareNonInheritedData.access()->m_clipPath = operation;
1212 } 1202 }
1213 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); } 1203 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); }
1214 1204
1215 static ClipPathOperation* initialClipPath() { return 0; } 1205 static ClipPathOperation* initialClipPath() { return 0; }
1216 1206
1217 const Length& shapeMargin() const { return rareNonInheritedData->m_shapeMarg in; }
1218 void setShapeMargin(const Length& shapeMargin) { SET_VAR(rareNonInheritedDat a, m_shapeMargin, shapeMargin); }
1219 static Length initialShapeMargin() { return Length(0, Fixed); }
1220
1221 float shapeImageThreshold() const { return rareNonInheritedData->m_shapeImag eThreshold; }
1222 void setShapeImageThreshold(float shapeImageThreshold)
1223 {
1224 float clampedShapeImageThreshold = clampTo<float>(shapeImageThreshold, 0 , 1);
1225 SET_VAR(rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageTh reshold);
1226 }
1227 static float initialShapeImageThreshold() { return 0; }
1228
1229 bool hasContent() const { return contentData(); } 1207 bool hasContent() const { return contentData(); }
1230 const ContentData* contentData() const { return rareNonInheritedData->m_cont ent.get(); } 1208 const ContentData* contentData() const { return rareNonInheritedData->m_cont ent.get(); }
1231 bool contentDataEquivalent(const RenderStyle* otherStyle) const { return con st_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_ cast<RenderStyle*>(otherStyle)->rareNonInheritedData); } 1209 bool contentDataEquivalent(const RenderStyle* otherStyle) const { return con st_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_ cast<RenderStyle*>(otherStyle)->rareNonInheritedData); }
1232 void clearContent(); 1210 void clearContent();
1233 void setContent(const String&, bool add = false); 1211 void setContent(const String&, bool add = false);
1234 void setContent(PassRefPtr<StyleImage>, bool add = false); 1212 void setContent(PassRefPtr<StyleImage>, bool add = false);
1235 1213
1236 const CounterDirectiveMap* counterDirectives() const; 1214 const CounterDirectiveMap* counterDirectives() const;
1237 CounterDirectiveMap& accessCounterDirectives(); 1215 CounterDirectiveMap& accessCounterDirectives();
1238 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const; 1216 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 1524
1547 rareInheritedData.access()->m_textOrientation = textOrientation; 1525 rareInheritedData.access()->m_textOrientation = textOrientation;
1548 return true; 1526 return true;
1549 } 1527 }
1550 1528
1551 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1529 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1552 1530
1553 } // namespace blink 1531 } // namespace blink
1554 1532
1555 #endif // RenderStyle_h 1533 #endif // RenderStyle_h
OLDNEW
« 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