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

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

Issue 16358010: [CSS Exclusions] Add CSS parsing support for image URI shape-inside and shape-outside values (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 void setShapeInside(PassRefPtr<ExclusionShapeValue> value) 1365 void setShapeInside(PassRefPtr<ExclusionShapeValue> value)
1366 { 1366 {
1367 if (rareNonInheritedData->m_shapeInside == value) 1367 if (rareNonInheritedData->m_shapeInside == value)
1368 return; 1368 return;
1369 rareNonInheritedData.access()->m_shapeInside = value; 1369 rareNonInheritedData.access()->m_shapeInside = value;
1370 } 1370 }
1371 ExclusionShapeValue* shapeInside() const { return rareNonInheritedData->m_sh apeInside.get(); } 1371 ExclusionShapeValue* shapeInside() const { return rareNonInheritedData->m_sh apeInside.get(); }
1372 ExclusionShapeValue* resolvedShapeInside() const 1372 ExclusionShapeValue* resolvedShapeInside() const
1373 { 1373 {
1374 ExclusionShapeValue* shapeInside = this->shapeInside(); 1374 ExclusionShapeValue* shapeInside = this->shapeInside();
1375 if (shapeInside && shapeInside->type() == ExclusionShapeValue::OUTSIDE) 1375 if (shapeInside && shapeInside->type() == ExclusionShapeValue::Outside)
1376 return shapeOutside(); 1376 return shapeOutside();
1377 return shapeInside; 1377 return shapeInside;
1378 } 1378 }
1379 1379
1380 void setShapeOutside(PassRefPtr<ExclusionShapeValue> value) 1380 void setShapeOutside(PassRefPtr<ExclusionShapeValue> value)
1381 { 1381 {
1382 if (rareNonInheritedData->m_shapeOutside == value) 1382 if (rareNonInheritedData->m_shapeOutside == value)
1383 return; 1383 return;
1384 rareNonInheritedData.access()->m_shapeOutside = value; 1384 rareNonInheritedData.access()->m_shapeOutside = value;
1385 } 1385 }
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1775 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1776 return false; 1776 return false;
1777 1777
1778 rareInheritedData.access()->m_textOrientation = textOrientation; 1778 rareInheritedData.access()->m_textOrientation = textOrientation;
1779 return true; 1779 return true;
1780 } 1780 }
1781 1781
1782 } // namespace WebCore 1782 } // namespace WebCore
1783 1783
1784 #endif // RenderStyle_h 1784 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698