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

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: Fix more (all?) tests 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 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 1420
1421 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); } 1421 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); }
1422 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); } 1422 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); }
1423 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); } 1423 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); }
1424 1424
1425 PassRefPtr<SVGLength> baselineShiftValue() const { return svgStyle()->baseli neShiftValue(); } 1425 PassRefPtr<SVGLength> baselineShiftValue() const { return svgStyle()->baseli neShiftValue(); }
1426 void setBaselineShiftValue(PassRefPtr<SVGLength> s) { accessSVGStyle()->setB aselineShiftValue(s); } 1426 void setBaselineShiftValue(PassRefPtr<SVGLength> s) { accessSVGStyle()->setB aselineShiftValue(s); }
1427 PassRefPtr<SVGLength> kerning() const { return svgStyle()->kerning(); } 1427 PassRefPtr<SVGLength> kerning() const { return svgStyle()->kerning(); }
1428 void setKerning(PassRefPtr<SVGLength> k) { accessSVGStyle()->setKerning(k); } 1428 void setKerning(PassRefPtr<SVGLength> k) { accessSVGStyle()->setKerning(k); }
1429 1429
1430 void setShapeInside(PassRefPtr<ShapeValue> value)
1431 {
1432 if (rareNonInheritedData->m_shapeInside == value)
1433 return;
1434 rareNonInheritedData.access()->m_shapeInside = value;
1435 }
1436 ShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside .get(); }
1437 ShapeValue* resolvedShapeInside() const
1438 {
1439 ShapeValue* shapeInside = this->shapeInside();
1440 if (shapeInside && shapeInside->type() == ShapeValue::Outside)
1441 return shapeOutside();
1442 return shapeInside;
1443 }
1444
1445 void setShapeOutside(PassRefPtr<ShapeValue> value) 1430 void setShapeOutside(PassRefPtr<ShapeValue> value)
1446 { 1431 {
1447 if (rareNonInheritedData->m_shapeOutside == value) 1432 if (rareNonInheritedData->m_shapeOutside == value)
1448 return; 1433 return;
1449 rareNonInheritedData.access()->m_shapeOutside = value; 1434 rareNonInheritedData.access()->m_shapeOutside = value;
1450 } 1435 }
1451 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutsi de.get(); } 1436 ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutsi de.get(); }
1452 1437
1453 static ShapeValue* initialShapeInside() { return 0; }
1454 static ShapeValue* initialShapeOutside() { return 0; } 1438 static ShapeValue* initialShapeOutside() { return 0; }
1455 1439
1456 void setClipPath(PassRefPtr<ClipPathOperation> operation) 1440 void setClipPath(PassRefPtr<ClipPathOperation> operation)
1457 { 1441 {
1458 if (rareNonInheritedData->m_clipPath != operation) 1442 if (rareNonInheritedData->m_clipPath != operation)
1459 rareNonInheritedData.access()->m_clipPath = operation; 1443 rareNonInheritedData.access()->m_clipPath = operation;
1460 } 1444 }
1461 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); } 1445 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); }
1462 1446
1463 static ClipPathOperation* initialClipPath() { return 0; } 1447 static ClipPathOperation* initialClipPath() { return 0; }
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1883 inline bool RenderStyle::hasPseudoElementStyle() const 1867 inline bool RenderStyle::hasPseudoElementStyle() const
1884 { 1868 {
1885 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1869 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1886 } 1870 }
1887 1871
1888 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1872 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1889 1873
1890 } // namespace WebCore 1874 } // namespace WebCore
1891 1875
1892 #endif // RenderStyle_h 1876 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698