Changeset 113208 in webkit
- Timestamp:
- Apr 4, 2012 10:13:16 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r113207 r113208 1 2012-04-04 Tony Chang <tony@chromium.org> 2 3 Remove flex function css parsing 4 https://bugs.webkit.org/show_bug.cgi?id=83083 5 6 Reviewed by Ojan Vafai. 7 8 Remove test of -webkit-flex() function. 9 10 * css3/flexbox/flex-parsing-expected.txt: Removed. 11 * css3/flexbox/flex-parsing.html: Removed. 12 * css3/flexbox/script-tests/flex-parsing.js: Removed. 13 1 14 2012-04-04 Dimitri Glazkov <dglazkov@chromium.org> 2 15 -
trunk/Source/WebCore/CMakeLists.txt
r113109 r113208 457 457 css/CSSCrossfadeValue.cpp 458 458 css/CSSCursorImageValue.cpp 459 css/CSSFlexValue.cpp460 459 css/CSSFontFace.cpp 461 460 css/CSSFontFaceRule.cpp -
trunk/Source/WebCore/ChangeLog
r113204 r113208 1 2012-04-04 Tony Chang <tony@chromium.org> 2 3 Remove flex function css parsing 4 https://bugs.webkit.org/show_bug.cgi?id=83083 5 6 Reviewed by Ojan Vafai. 7 8 The flexbox spec switched from using a flex() function on the width 9 and height to a css property. Now that the -webkit-flex: has been 10 implemented, we can remove the flex() function code. 11 12 No new tests. Removing an old test that used to test the flex() function. 13 14 * CMakeLists.txt: 15 * GNUmakefile.list.am: 16 * Target.pri: 17 * WebCore.gypi: 18 * WebCore.vcproj/WebCore.vcproj: 19 * WebCore.xcodeproj/project.pbxproj: 20 * css/CSSAllInOne.cpp: 21 * css/CSSFlexValue.cpp: Removed. 22 * css/CSSFlexValue.h: Removed. 23 * css/CSSParser.cpp: 24 (WebCore::CSSParser::parseValue): 25 (WebCore::CSSParser::parseFlex): 26 * css/CSSParser.h: 27 (WebCore): 28 * css/CSSStyleApplyProperty.cpp: 29 (WebCore::ApplyPropertyLength::applyValue): 30 (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty): 31 * css/CSSValue.cpp: 32 (WebCore::CSSValue::cssText): 33 (WebCore::CSSValue::destroy): 34 * css/CSSValue.h: 35 * rendering/style/RenderStyle.h: 36 * rendering/style/StyleFlexibleBoxData.cpp: 37 (WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData): 38 (WebCore::StyleFlexibleBoxData::operator==): 39 * rendering/style/StyleFlexibleBoxData.h: 40 1 41 2012-04-04 Kausalya Madhusudhanan <kmadhusu@chromium.org> 2 42 -
trunk/Source/WebCore/GNUmakefile.list.am
r113109 r113208 1575 1575 Source/WebCore/css/CSSCursorImageValue.cpp \ 1576 1576 Source/WebCore/css/CSSCursorImageValue.h \ 1577 Source/WebCore/css/CSSFlexValue.cpp \1578 Source/WebCore/css/CSSFlexValue.h \1579 1577 Source/WebCore/css/CSSFontFace.cpp \ 1580 1578 Source/WebCore/css/CSSFontFace.h \ -
trunk/Source/WebCore/Target.pri
r113111 r113208 432 432 css/CSSCrossfadeValue.cpp \ 433 433 css/CSSCursorImageValue.cpp \ 434 css/CSSFlexValue.cpp \435 434 css/CSSFontFace.cpp \ 436 435 css/CSSFontFaceRule.cpp \ … … 1577 1576 css/CSSCrossfadeValue.h \ 1578 1577 css/CSSCursorImageValue.h \ 1579 css/CSSFlexValue.h \1580 1578 css/CSSFontFace.h \ 1581 1579 css/CSSFontFaceRule.h \ -
trunk/Source/WebCore/WebCore.gypi
r113166 r113208 2379 2379 'css/CSSCrossfadeValue.h', 2380 2380 'css/CSSCursorImageValue.cpp', 2381 'css/CSSFlexValue.cpp',2382 'css/CSSFlexValue.h',2383 2381 'css/CSSFontFace.cpp', 2384 2382 'css/CSSFontFace.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r113109 r113208 34259 34259 </File> 34260 34260 <File 34261 RelativePath="..\css\CSSFlexValue.cpp"34262 >34263 <FileConfiguration34264 Name="Debug|Win32"34265 ExcludedFromBuild="true"34266 >34267 <Tool34268 Name="VCCLCompilerTool"34269 />34270 </FileConfiguration>34271 <FileConfiguration34272 Name="Release|Win32"34273 ExcludedFromBuild="true"34274 >34275 <Tool34276 Name="VCCLCompilerTool"34277 />34278 </FileConfiguration>34279 <FileConfiguration34280 Name="Debug_Cairo_CFLite|Win32"34281 ExcludedFromBuild="true"34282 >34283 <Tool34284 Name="VCCLCompilerTool"34285 />34286 </FileConfiguration>34287 <FileConfiguration34288 Name="Release_Cairo_CFLite|Win32"34289 ExcludedFromBuild="true"34290 >34291 <Tool34292 Name="VCCLCompilerTool"34293 />34294 </FileConfiguration>34295 <FileConfiguration34296 Name="Debug_All|Win32"34297 ExcludedFromBuild="true"34298 >34299 <Tool34300 Name="VCCLCompilerTool"34301 />34302 </FileConfiguration>34303 <FileConfiguration34304 Name="Production|Win32"34305 ExcludedFromBuild="true"34306 >34307 <Tool34308 Name="VCCLCompilerTool"34309 />34310 </FileConfiguration>34311 </File>34312 <File34313 RelativePath="..\css\CSSFlexValue.h"34314 >34315 </File>34316 <File34317 34261 RelativePath="..\css\CSSFontFace.cpp" 34318 34262 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r113109 r113208 1570 1570 5317612213C516690026E454 /* StyleFlexibleBoxData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5317612013C516690026E454 /* StyleFlexibleBoxData.cpp */; }; 1571 1571 5317612313C516690026E454 /* StyleFlexibleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5317612113C516690026E454 /* StyleFlexibleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1572 5325E4D713A6C88B00404A36 /* CSSFlexValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5325E4D513A6C88B00404A36 /* CSSFlexValue.cpp */; };1573 5325E4D813A6C88B00404A36 /* CSSFlexValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5325E4D613A6C88B00404A36 /* CSSFlexValue.h */; };1574 1572 53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */; }; 1575 1573 53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */; }; … … 8547 8545 5317612013C516690026E454 /* StyleFlexibleBoxData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleFlexibleBoxData.cpp; path = style/StyleFlexibleBoxData.cpp; sourceTree = "<group>"; }; 8548 8546 5317612113C516690026E454 /* StyleFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFlexibleBoxData.h; path = style/StyleFlexibleBoxData.h; sourceTree = "<group>"; }; 8549 5325E4D513A6C88B00404A36 /* CSSFlexValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFlexValue.cpp; sourceTree = "<group>"; };8550 5325E4D613A6C88B00404A36 /* CSSFlexValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFlexValue.h; sourceTree = "<group>"; };8551 8547 53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFlexibleBox.cpp; sourceTree = "<group>"; }; 8552 8548 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFlexibleBox.h; sourceTree = "<group>"; }; … … 20459 20455 AA0978ED0ABAA6E100874480 /* CSSCursorImageValue.cpp */, 20460 20456 AA0978EE0ABAA6E100874480 /* CSSCursorImageValue.h */, 20461 5325E4D513A6C88B00404A36 /* CSSFlexValue.cpp */,20462 5325E4D613A6C88B00404A36 /* CSSFlexValue.h */,20463 20457 BC64B4CD0CB4298A005F2B62 /* CSSFontFace.cpp */, 20464 20458 BC64B4CE0CB4298A005F2B62 /* CSSFontFace.h */, … … 21808 21802 2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */, 21809 21803 AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers */, 21810 5325E4D813A6C88B00404A36 /* CSSFlexValue.h in Headers */,21811 21804 BC64B4D60CB4298A005F2B62 /* CSSFontFace.h in Headers */, 21812 21805 A80E6CFD0A1989CA007FB8C5 /* CSSFontFaceRule.h in Headers */, … … 25285 25278 2D8FEBDC143E3EF70072502B /* CSSCrossfadeValue.cpp in Sources */, 25286 25279 AA21ECCA0ABF0FBA002B834C /* CSSCursorImageValue.cpp in Sources */, 25287 5325E4D713A6C88B00404A36 /* CSSFlexValue.cpp in Sources */,25288 25280 BC64B4D50CB4298A005F2B62 /* CSSFontFace.cpp in Sources */, 25289 25281 A80E6CE70A1989CA007FB8C5 /* CSSFontFaceRule.cpp in Sources */, -
trunk/Source/WebCore/css/CSSAllInOne.cpp
r112914 r113208 34 34 #include "CSSCrossfadeValue.cpp" 35 35 #include "CSSCursorImageValue.cpp" 36 #include "CSSFlexValue.cpp"37 36 #include "CSSFontFace.cpp" 38 37 #include "CSSFontFaceRule.cpp" -
trunk/Source/WebCore/css/CSSParser.cpp
r113139 r113208 32 32 #include "CSSCrossfadeValue.h" 33 33 #include "CSSCursorImageValue.h" 34 #include "CSSFlexValue.h"35 34 #include "CSSFontFaceRule.h" 36 35 #include "CSSFontFaceSrcValue.h" … … 1788 1787 // ### handle multilength case where we allow relative units 1789 1788 validPrimitive = true; 1790 else if (value->unit == CSSParserValue::Function) {1791 // FIXME: Remove -webkit-flex() handling once we finish implementing the -webkit-flex propery.1792 if (!equalIgnoringCase(value->function->name, "-webkit-flex(") || m_valueList->next())1793 return false;1794 parsedValue = parseFlex(value->function->args.get());1795 }1796 1789 break; 1797 1790 … … 2020 2013 break; 2021 2014 #endif 2022 case CSSPropertyWebkitFlex: {2015 case CSSPropertyWebkitFlex: 2023 2016 if (id == CSSValueNone) 2024 2017 validPrimitive = true; 2025 else if (RefPtr<CSSFlexValue> flexValue = parseFlex(m_valueList.get())) { 2026 RefPtr<CSSValueList> flexList = CSSValueList::createSpaceSeparated(); 2027 flexList->append(cssValuePool()->createValue(flexValue->positiveFlex(), CSSPrimitiveValue::CSS_NUMBER)); 2028 flexList->append(cssValuePool()->createValue(flexValue->negativeFlex(), CSSPrimitiveValue::CSS_NUMBER)); 2029 flexList->append(flexValue->preferredSize()); 2030 parsedValue = flexList; 2031 } 2032 break; 2033 } 2018 else 2019 parsedValue = parseFlex(m_valueList.get()); 2020 break; 2034 2021 case CSSPropertyWebkitFlexOrder: 2035 2022 if (validUnit(value, FInteger, CSSStrictMode)) { … … 5517 5504 } 5518 5505 5519 PassRefPtr<CSS FlexValue> CSSParser::parseFlex(CSSParserValueList* args)5506 PassRefPtr<CSSValue> CSSParser::parseFlex(CSSParserValueList* args) 5520 5507 { 5521 5508 if (!args || !args->size() || args->size() > 3) … … 5555 5542 preferredSize = cssValuePool()->createValue(0, CSSPrimitiveValue::CSS_PX); 5556 5543 5557 RefPtr<CSSFlexValue> flex = CSSFlexValue::create(clampToFloat(positiveFlex), clampToFloat(negativeFlex), preferredSize); 5544 RefPtr<CSSValueList> flex = CSSValueList::createSpaceSeparated(); 5545 flex->append(cssValuePool()->createValue(clampToFloat(positiveFlex), CSSPrimitiveValue::CSS_NUMBER)); 5546 flex->append(cssValuePool()->createValue(clampToFloat(negativeFlex), CSSPrimitiveValue::CSS_NUMBER)); 5547 flex->append(preferredSize); 5558 5548 return flex; 5559 5549 } -
trunk/Source/WebCore/css/CSSParser.h
r113187 r113208 54 54 class CSSValue; 55 55 class CSSValueList; 56 class CSSFlexValue;57 56 class CSSWrapShape; 58 57 class Document; … … 189 188 bool parseReflect(CSSPropertyID, bool important); 190 189 191 PassRefPtr<CSS FlexValue> parseFlex(CSSParserValueList* args);190 PassRefPtr<CSSValue> parseFlex(CSSParserValueList* args); 192 191 193 192 // Image generators -
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
r112968 r113208 29 29 #include "CSSCalculationValue.h" 30 30 #include "CSSCursorImageValue.h" 31 #include "CSSFlexValue.h"32 31 #include "CSSPrimitiveValueMappings.h" 33 32 #include "CSSStyleSelector.h" … … 337 336 enum LengthNone { NoneDisabled = 0, NoneEnabled }; 338 337 enum LengthUndefined { UndefinedDisabled = 0, UndefinedEnabled }; 339 enum LengthFlexDirection { FlexDirectionDisabled = 0, FlexWidth, FlexHeight };340 338 template <Length (RenderStyle::*getterFunction)() const, 341 339 void (RenderStyle::*setterFunction)(Length), … … 345 343 LengthMinIntrinsic minIntrinsicEnabled = MinIntrinsicDisabled, 346 344 LengthNone noneEnabled = NoneDisabled, 347 LengthUndefined noneUndefined = UndefinedDisabled, 348 LengthFlexDirection flexDirection = FlexDirectionDisabled> 345 LengthUndefined noneUndefined = UndefinedDisabled> 349 346 class ApplyPropertyLength { 350 347 public: … … 352 349 static void applyValue(CSSStyleSelector* selector, CSSValue* value) 353 350 { 354 float positiveFlex = 0; 355 float negativeFlex = 0; 356 if (!value->isPrimitiveValue()) { 357 if (!flexDirection || !value->isFlexValue()) 358 return; 359 360 CSSFlexValue* flexValue = static_cast<CSSFlexValue*>(value); 361 value = flexValue->preferredSize(); 362 363 positiveFlex = flexValue->positiveFlex(); 364 negativeFlex = flexValue->negativeFlex(); 365 } 366 367 if (flexDirection == FlexWidth) { 368 selector->style()->setFlexboxWidthPositiveFlex(positiveFlex); 369 selector->style()->setFlexboxWidthNegativeFlex(negativeFlex); 370 } else if (flexDirection == FlexHeight) { 371 selector->style()->setFlexboxHeightPositiveFlex(positiveFlex); 372 selector->style()->setFlexboxHeightNegativeFlex(negativeFlex); 373 } 351 if (!value->isPrimitiveValue()) 352 return; 374 353 375 354 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value); … … 1859 1838 setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>::createHandler()); 1860 1839 setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler()); 1861 setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled , FlexHeight>::createHandler());1840 setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler()); 1862 1841 setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRendering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRendering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler()); 1863 1842 setPropertyHandler(CSSPropertyLeft, ApplyPropertyLength<&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset, AutoEnabled>::createHandler()); … … 2038 2017 setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler()); 2039 2018 setPropertyHandler(CSSPropertyWidows, ApplyPropertyDefault<short, &RenderStyle::widows, short, &RenderStyle::setWidows, short, &RenderStyle::initialWidows>::createHandler()); 2040 setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled , FlexWidth>::createHandler());2019 setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler()); 2041 2020 setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &RenderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &RenderStyle::initialWordBreak>::createHandler()); 2042 2021 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, &RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler()); -
trunk/Source/WebCore/css/CSSValue.cpp
r111637 r113208 34 34 #include "CSSCrossfadeValue.h" 35 35 #include "CSSCursorImageValue.h" 36 #include "CSSFlexValue.h"37 36 #include "CSSFontFaceSrcValue.h" 38 37 #include "CSSFunctionValue.h" … … 147 146 case LineBoxContainClass: 148 147 return static_cast<const CSSLineBoxContainValue*>(this)->customCssText(); 149 case FlexClass:150 return static_cast<const CSSFlexValue*>(this)->customCssText();151 148 case CalculationClass: 152 149 return static_cast<const CSSCalcValue*>(this)->customCssText(); … … 249 246 delete static_cast<CSSLineBoxContainValue*>(this); 250 247 return; 251 case FlexClass:252 delete static_cast<CSSFlexValue*>(this);253 return;254 248 case CalculationClass: 255 249 delete static_cast<CSSCalcValue*>(this); -
trunk/Source/WebCore/css/CSSValue.h
r112730 r113208 80 80 bool isWebKitCSSTransformValue() const { return m_classType == WebKitCSSTransformClass; } 81 81 bool isCSSLineBoxContainValue() const { return m_classType == LineBoxContainClass; } 82 bool isFlexValue() const { return m_classType == FlexClass; }83 82 bool isCalculationValue() const {return m_classType == CalculationClass; } 84 83 #if ENABLE(CSS_FILTERS) … … 131 130 UnicodeRangeClass, 132 131 LineBoxContainClass, 133 FlexClass,134 132 CalculationClass, 135 133 #if ENABLE(CSS_FILTERS) && ENABLE(CSS_SHADERS) -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r112968 r113208 808 808 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData->m_deprecatedFlexibleBox->pack); } 809 809 810 float flexboxWidthPositiveFlex() const { return rareNonInheritedData->m_flexibleBox->m_widthPositiveFlex; }811 float flexboxWidthNegativeFlex() const { return rareNonInheritedData->m_flexibleBox->m_widthNegativeFlex; }812 float flexboxHeightPositiveFlex() const { return rareNonInheritedData->m_flexibleBox->m_heightPositiveFlex; }813 float flexboxHeightNegativeFlex() const { return rareNonInheritedData->m_flexibleBox->m_heightNegativeFlex; }814 810 float positiveFlex() const { return rareNonInheritedData->m_flexibleBox->m_positiveFlex; } 815 811 float negativeFlex() const { return rareNonInheritedData->m_flexibleBox->m_negativeFlex; } … … 1251 1247 void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInheritedData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = reflect; } 1252 1248 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); } 1253 void setFlexboxWidthPositiveFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_widthPositiveFlex, f); }1254 void setFlexboxWidthNegativeFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_widthNegativeFlex, f); }1255 void setFlexboxHeightPositiveFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_heightPositiveFlex, f); }1256 void setFlexboxHeightNegativeFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_heightNegativeFlex, f); }1257 1249 void setPositiveFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_positiveFlex, f); } 1258 1250 void setNegativeFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_negativeFlex, f); } -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
r112968 r113208 32 32 33 33 StyleFlexibleBoxData::StyleFlexibleBoxData() 34 : m_widthPositiveFlex(RenderStyle::initialPositiveFlex()) 35 , m_widthNegativeFlex(RenderStyle::initialNegativeFlex()) 36 , m_heightPositiveFlex(RenderStyle::initialPositiveFlex()) 37 , m_heightNegativeFlex(RenderStyle::initialNegativeFlex()) 38 , m_positiveFlex(RenderStyle::initialPositiveFlex()) 34 : m_positiveFlex(RenderStyle::initialPositiveFlex()) 39 35 , m_negativeFlex(RenderStyle::initialNegativeFlex()) 40 36 , m_preferredSize(RenderStyle::initialFlexPreferredSize()) … … 51 47 StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o) 52 48 : RefCounted<StyleFlexibleBoxData>() 53 , m_widthPositiveFlex(o.m_widthPositiveFlex)54 , m_widthNegativeFlex(o.m_widthNegativeFlex)55 , m_heightPositiveFlex(o.m_heightPositiveFlex)56 , m_heightNegativeFlex(o.m_heightNegativeFlex)57 49 , m_positiveFlex(o.m_positiveFlex) 58 50 , m_negativeFlex(o.m_negativeFlex) … … 70 62 bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& o) const 71 63 { 72 return m_widthPositiveFlex == o.m_widthPositiveFlex && m_widthNegativeFlex == o.m_widthNegativeFlex 73 && m_heightPositiveFlex == o.m_heightPositiveFlex && m_heightNegativeFlex == o.m_heightNegativeFlex 74 && m_positiveFlex == o.m_positiveFlex && m_negativeFlex == o.m_negativeFlex && m_preferredSize == o.m_preferredSize 64 return m_positiveFlex == o.m_positiveFlex && m_negativeFlex == o.m_negativeFlex && m_preferredSize == o.m_preferredSize 75 65 && m_flexOrder == o.m_flexOrder && m_flexPack == o.m_flexPack && m_flexAlign == o.m_flexAlign 76 66 && m_flexItemAlign == o.m_flexItemAlign && m_flexDirection == o.m_flexDirection && m_flexWrap == o.m_flexWrap -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
r112968 r113208 45 45 } 46 46 47 // FIXME: Remove these once we finish implementing the -webkit-flex property.48 float m_widthPositiveFlex;49 float m_widthNegativeFlex;50 float m_heightPositiveFlex;51 float m_heightNegativeFlex;52 53 47 float m_positiveFlex; 54 48 float m_negativeFlex;
Note: See TracChangeset
for help on using the changeset viewer.