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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove now unused segmentIsEmpty Created 6 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) 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 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 1415
1416 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); } 1416 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); }
1417 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); } 1417 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); }
1418 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); } 1418 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); }
1419 1419
1420 PassRefPtr<SVGLength> baselineShiftValue() const { return svgStyle()->baseli neShiftValue(); } 1420 PassRefPtr<SVGLength> baselineShiftValue() const { return svgStyle()->baseli neShiftValue(); }
1421 void setBaselineShiftValue(PassRefPtr<SVGLength> s) { accessSVGStyle()->setB aselineShiftValue(s); } 1421 void setBaselineShiftValue(PassRefPtr<SVGLength> s) { accessSVGStyle()->setB aselineShiftValue(s); }
1422 PassRefPtr<SVGLength> kerning() const { return svgStyle()->kerning(); } 1422 PassRefPtr<SVGLength> kerning() const { return svgStyle()->kerning(); }
1423 void setKerning(PassRefPtr<SVGLength> k) { accessSVGStyle()->setKerning(k); } 1423 void setKerning(PassRefPtr<SVGLength> k) { accessSVGStyle()->setKerning(k); }
1424 1424
1425 void setShapeInside(PassRefPtr<ShapeValue> value)
1426 {
1427 if (rareNonInheritedData->m_shapeInside == value)
1428 return;
1429 rareNonInheritedData.access()->m_shapeInside = value;
1430 }
1431 ShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside .get(); }
1432 ShapeValue* resolvedShapeInside() const
1433 {
1434 ShapeValue* shapeInside = this->shapeInside();
1435 if (shapeInside && shapeInside->type() == ShapeValue::Outside)
1436 return shapeOutside();
1437 return shapeInside;
1438 }
1439
1440 void setShapeOutside(PassRefPtr<ShapeValue> value) 1425 void setShapeOutside(PassRefPtr<ShapeValue> value)
1441 { 1426 {
1442 if (rareNonInheritedData->m_shapeOutside == value) 1427 if (rareNonInheritedData->m_shapeOutside == value)
1443 return; 1428 return;
1444 rareNonInheritedData.access()->m_shapeOutside = value; 1429 rareNonInheritedData.access()->m_shapeOutside = value;
1445 } 1430 }
1446 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutsi de.get(); } 1431 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutsi de.get(); }
1447 1432
1448 static ShapeValue* initialShapeInside() { return 0; }
1449 static ShapeValue* initialShapeOutside() { return 0; } 1433 static ShapeValue* initialShapeOutside() { return 0; }
1450 1434
1451 void setClipPath(PassRefPtr<ClipPathOperation> operation) 1435 void setClipPath(PassRefPtr<ClipPathOperation> operation)
1452 { 1436 {
1453 if (rareNonInheritedData->m_clipPath != operation) 1437 if (rareNonInheritedData->m_clipPath != operation)
1454 rareNonInheritedData.access()->m_clipPath = operation; 1438 rareNonInheritedData.access()->m_clipPath = operation;
1455 } 1439 }
1456 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); } 1440 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); }
1457 1441
1458 static ClipPathOperation* initialClipPath() { return 0; } 1442 static ClipPathOperation* initialClipPath() { return 0; }
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1876 inline bool RenderStyle::hasPseudoElementStyle() const 1860 inline bool RenderStyle::hasPseudoElementStyle() const
1877 { 1861 {
1878 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1862 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1879 } 1863 }
1880 1864
1881 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1865 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1882 1866
1883 } // namespace WebCore 1867 } // namespace WebCore
1884 1868
1885 #endif // RenderStyle_h 1869 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/shapes/ShapeInsideInfo.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698