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

Side by Side Diff: Source/WebCore/css/StyleBuilder.cpp

Issue 13674002: Support intrinsic values for height, min-height and max-height (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: better fixme comment Created 7 years, 8 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler()); 2123 setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler());
2124 setPropertyHandler(CSSPropertyDirection, ApplyPropertyDirection<&RenderStyle ::direction, &RenderStyle::setDirection, RenderStyle::initialDirection>::createH andler()); 2124 setPropertyHandler(CSSPropertyDirection, ApplyPropertyDirection<&RenderStyle ::direction, &RenderStyle::setDirection, RenderStyle::initialDirection>::createH andler());
2125 setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler() ); 2125 setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler() );
2126 setPropertyHandler(CSSPropertyEmptyCells, ApplyPropertyDefault<EEmptyCell, & RenderStyle::emptyCells, EEmptyCell, &RenderStyle::setEmptyCells, EEmptyCell, &R enderStyle::initialEmptyCells>::createHandler()); 2126 setPropertyHandler(CSSPropertyEmptyCells, ApplyPropertyDefault<EEmptyCell, & RenderStyle::emptyCells, EEmptyCell, &RenderStyle::setEmptyCells, EEmptyCell, &R enderStyle::initialEmptyCells>::createHandler());
2127 setPropertyHandler(CSSPropertyFloat, ApplyPropertyDefault<EFloat, &RenderSty le::floating, EFloat, &RenderStyle::setFloating, EFloat, &RenderStyle::initialFl oating>::createHandler()); 2127 setPropertyHandler(CSSPropertyFloat, ApplyPropertyDefault<EFloat, &RenderSty le::floating, EFloat, &RenderStyle::setFloating, EFloat, &RenderStyle::initialFl oating>::createHandler());
2128 setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHan dler()); 2128 setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHan dler());
2129 setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler ()); 2129 setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler ());
2130 setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &Font Description::italic, &FontDescription::setItalic, FontItalicOff>::createHandler( )); 2130 setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &Font Description::italic, &FontDescription::setItalic, FontItalicOff>::createHandler( ));
2131 setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>:: createHandler()); 2131 setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>:: createHandler());
2132 setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHan dler()); 2132 setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHan dler());
2133 setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::heig ht, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, LegacyIntri nsicEnabled, IntrinsicDisabled, NoneDisabled, UndefinedDisabled>::createHandler( )); 2133 setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::heig ht, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, LegacyIntri nsicEnabled, IntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler() );
2134 #if ENABLE(CSS_IMAGE_ORIENTATION) 2134 #if ENABLE(CSS_IMAGE_ORIENTATION)
2135 setPropertyHandler(CSSPropertyImageOrientation, ApplyPropertyDefault<ImageOr ientationEnum, &RenderStyle::imageOrientation, ImageOrientationEnum, &RenderStyl e::setImageOrientation, ImageOrientationEnum, &RenderStyle::initialImageOrientat ion>::createHandler()); 2135 setPropertyHandler(CSSPropertyImageOrientation, ApplyPropertyDefault<ImageOr ientationEnum, &RenderStyle::imageOrientation, ImageOrientationEnum, &RenderStyl e::setImageOrientation, ImageOrientationEnum, &RenderStyle::initialImageOrientat ion>::createHandler());
2136 #endif 2136 #endif
2137 setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRen dering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRen dering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler()); 2137 setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRen dering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRen dering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler());
2138 #if ENABLE(CSS_IMAGE_RESOLUTION) 2138 #if ENABLE(CSS_IMAGE_RESOLUTION)
2139 setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution: :createHandler()); 2139 setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution: :createHandler());
2140 #endif 2140 #endif
2141 setPropertyHandler(CSSPropertyLeft, ApplyPropertyLength<&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset, AutoEnabled>::createHandler( )); 2141 setPropertyHandler(CSSPropertyLeft, ApplyPropertyLength<&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset, AutoEnabled>::createHandler( ));
2142 setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<int, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::init ialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createH andler()); 2142 setPropertyHandler(CSSPropertyLetterSpacing, ApplyPropertyComputeLength<int, &RenderStyle::letterSpacing, &RenderStyle::setLetterSpacing, &RenderStyle::init ialLetterWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createH andler());
2143 setPropertyHandler(CSSPropertyLineHeight, ApplyPropertyLineHeight::createHan dler()); 2143 setPropertyHandler(CSSPropertyLineHeight, ApplyPropertyLineHeight::createHan dler());
2144 setPropertyHandler(CSSPropertyListStyleImage, ApplyPropertyStyleImage<&Rende rStyle::listStyleImage, &RenderStyle::setListStyleImage, &RenderStyle::initialLi stStyleImage, CSSPropertyListStyleImage>::createHandler()); 2144 setPropertyHandler(CSSPropertyListStyleImage, ApplyPropertyStyleImage<&Rende rStyle::listStyleImage, &RenderStyle::setListStyleImage, &RenderStyle::initialLi stStyleImage, CSSPropertyListStyleImage>::createHandler());
2145 setPropertyHandler(CSSPropertyListStylePosition, ApplyPropertyDefault<EListS tylePosition, &RenderStyle::listStylePosition, EListStylePosition, &RenderStyle: :setListStylePosition, EListStylePosition, &RenderStyle::initialListStylePositio n>::createHandler()); 2145 setPropertyHandler(CSSPropertyListStylePosition, ApplyPropertyDefault<EListS tylePosition, &RenderStyle::listStylePosition, EListStylePosition, &RenderStyle: :setListStylePosition, EListStylePosition, &RenderStyle::initialListStylePositio n>::createHandler());
2146 setPropertyHandler(CSSPropertyListStyleType, ApplyPropertyDefault<EListStyle Type, &RenderStyle::listStyleType, EListStyleType, &RenderStyle::setListStyleTyp e, EListStyleType, &RenderStyle::initialListStyleType>::createHandler()); 2146 setPropertyHandler(CSSPropertyListStyleType, ApplyPropertyDefault<EListStyle Type, &RenderStyle::listStyleType, EListStyleType, &RenderStyle::setListStyleTyp e, EListStyleType, &RenderStyle::initialListStyleType>::createHandler());
2147 setPropertyHandler(CSSPropertyMarginBottom, ApplyPropertyLength<&RenderStyle ::marginBottom, &RenderStyle::setMarginBottom, &RenderStyle::initialMargin, Auto Enabled>::createHandler()); 2147 setPropertyHandler(CSSPropertyMarginBottom, ApplyPropertyLength<&RenderStyle ::marginBottom, &RenderStyle::setMarginBottom, &RenderStyle::initialMargin, Auto Enabled>::createHandler());
2148 setPropertyHandler(CSSPropertyMarginLeft, ApplyPropertyLength<&RenderStyle:: marginLeft, &RenderStyle::setMarginLeft, &RenderStyle::initialMargin, AutoEnable d>::createHandler()); 2148 setPropertyHandler(CSSPropertyMarginLeft, ApplyPropertyLength<&RenderStyle:: marginLeft, &RenderStyle::setMarginLeft, &RenderStyle::initialMargin, AutoEnable d>::createHandler());
2149 setPropertyHandler(CSSPropertyMarginRight, ApplyPropertyLength<&RenderStyle: :marginRight, &RenderStyle::setMarginRight, &RenderStyle::initialMargin, AutoEna bled>::createHandler()); 2149 setPropertyHandler(CSSPropertyMarginRight, ApplyPropertyLength<&RenderStyle: :marginRight, &RenderStyle::setMarginRight, &RenderStyle::initialMargin, AutoEna bled>::createHandler());
2150 setPropertyHandler(CSSPropertyMarginTop, ApplyPropertyLength<&RenderStyle::m arginTop, &RenderStyle::setMarginTop, &RenderStyle::initialMargin, AutoEnabled>: :createHandler()); 2150 setPropertyHandler(CSSPropertyMarginTop, ApplyPropertyLength<&RenderStyle::m arginTop, &RenderStyle::setMarginTop, &RenderStyle::initialMargin, AutoEnabled>: :createHandler());
2151 setPropertyHandler(CSSPropertyMaxHeight, ApplyPropertyLength<&RenderStyle::m axHeight, &RenderStyle::setMaxHeight, &RenderStyle::initialMaxSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled, NoneEnabled, UndefinedEnabled>::crea teHandler()); 2151 setPropertyHandler(CSSPropertyMaxHeight, ApplyPropertyLength<&RenderStyle::m axHeight, &RenderStyle::setMaxHeight, &RenderStyle::initialMaxSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneEnabled, UndefinedEnabled>::creat eHandler());
2152 setPropertyHandler(CSSPropertyMaxWidth, ApplyPropertyLength<&RenderStyle::ma xWidth, &RenderStyle::setMaxWidth, &RenderStyle::initialMaxSize, AutoEnabled, Le gacyIntrinsicEnabled, IntrinsicEnabled, NoneEnabled, UndefinedEnabled>::createHa ndler()); 2152 setPropertyHandler(CSSPropertyMaxWidth, ApplyPropertyLength<&RenderStyle::ma xWidth, &RenderStyle::setMaxWidth, &RenderStyle::initialMaxSize, AutoEnabled, Le gacyIntrinsicEnabled, IntrinsicEnabled, NoneEnabled, UndefinedEnabled>::createHa ndler());
2153 setPropertyHandler(CSSPropertyMinHeight, ApplyPropertyLength<&RenderStyle::m inHeight, &RenderStyle::setMinHeight, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled>::createHandler()); 2153 setPropertyHandler(CSSPropertyMinHeight, ApplyPropertyLength<&RenderStyle::m inHeight, &RenderStyle::setMinHeight, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled>::createHandler());
2154 setPropertyHandler(CSSPropertyMinWidth, ApplyPropertyLength<&RenderStyle::mi nWidth, &RenderStyle::setMinWidth, &RenderStyle::initialMinSize, AutoEnabled, Le gacyIntrinsicEnabled, IntrinsicEnabled>::createHandler()); 2154 setPropertyHandler(CSSPropertyMinWidth, ApplyPropertyLength<&RenderStyle::mi nWidth, &RenderStyle::setMinWidth, &RenderStyle::initialMinSize, AutoEnabled, Le gacyIntrinsicEnabled, IntrinsicEnabled>::createHandler());
2155 setPropertyHandler(CSSPropertyOpacity, ApplyPropertyDefault<float, &RenderSt yle::opacity, float, &RenderStyle::setOpacity, float, &RenderStyle::initialOpaci ty>::createHandler()); 2155 setPropertyHandler(CSSPropertyOpacity, ApplyPropertyDefault<float, &RenderSt yle::opacity, float, &RenderStyle::setOpacity, float, &RenderStyle::initialOpaci ty>::createHandler());
2156 setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle ::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle: :setHasAutoOrphans>::createHandler()); 2156 setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle ::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle: :setHasAutoOrphans>::createHandler());
2157 setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFrom Parent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle: :setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler()); 2157 setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFrom Parent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle: :setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
2158 setPropertyHandler(CSSPropertyOutlineOffset, ApplyPropertyComputeLength<int, &RenderStyle::outlineOffset, &RenderStyle::setOutlineOffset, &RenderStyle::init ialOutlineOffset>::createHandler()); 2158 setPropertyHandler(CSSPropertyOutlineOffset, ApplyPropertyComputeLength<int, &RenderStyle::outlineOffset, &RenderStyle::setOutlineOffset, &RenderStyle::init ialOutlineOffset>::createHandler());
2159 setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::creat eHandler()); 2159 setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::creat eHandler());
2160 setPropertyHandler(CSSPropertyOutlineWidth, ApplyPropertyComputeLength<unsig ned short, &RenderStyle::outlineWidth, &RenderStyle::setOutlineWidth, &RenderSty le::initialOutlineWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2160 setPropertyHandler(CSSPropertyOutlineWidth, ApplyPropertyComputeLength<unsig ned short, &RenderStyle::outlineWidth, &RenderStyle::setOutlineWidth, &RenderSty le::initialOutlineWidth, NormalDisabled, ThicknessEnabled>::createHandler());
2161 setPropertyHandler(CSSPropertyOverflowWrap, ApplyPropertyDefault<EOverflowWr ap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EO verflowWrap, &RenderStyle::initialOverflowWrap>::createHandler()); 2161 setPropertyHandler(CSSPropertyOverflowWrap, ApplyPropertyDefault<EOverflowWr ap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EO verflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());
2162 setPropertyHandler(CSSPropertyOverflowX, ApplyPropertyDefault<EOverflow, &Re nderStyle::overflowX, EOverflow, &RenderStyle::setOverflowX, EOverflow, &RenderS tyle::initialOverflowX>::createHandler()); 2162 setPropertyHandler(CSSPropertyOverflowX, ApplyPropertyDefault<EOverflow, &Re nderStyle::overflowX, EOverflow, &RenderStyle::setOverflowX, EOverflow, &RenderS tyle::initialOverflowX>::createHandler());
2163 setPropertyHandler(CSSPropertyOverflowY, ApplyPropertyDefault<EOverflow, &Re nderStyle::overflowY, EOverflow, &RenderStyle::setOverflowY, EOverflow, &RenderS tyle::initialOverflowY>::createHandler()); 2163 setPropertyHandler(CSSPropertyOverflowY, ApplyPropertyDefault<EOverflow, &Re nderStyle::overflowY, EOverflow, &RenderStyle::setOverflowY, EOverflow, &RenderS tyle::initialOverflowY>::createHandler());
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2343 setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &R enderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &Rend erStyle::initialWordBreak>::createHandler()); 2343 setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &R enderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &Rend erStyle::initialWordBreak>::createHandler());
2344 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, & RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLet terWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler ()); 2344 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, & RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLet terWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler ());
2345 // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' p roperty. So using the same handlers. 2345 // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' p roperty. So using the same handlers.
2346 setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverf lowWrap, &RenderStyle::initialOverflowWrap>::createHandler()); 2346 setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverf lowWrap, &RenderStyle::initialOverflowWrap>::createHandler());
2347 setPropertyHandler(CSSPropertyZIndex, ApplyPropertyAuto<int, &RenderStyle::z Index, &RenderStyle::setZIndex, &RenderStyle::hasAutoZIndex, &RenderStyle::setHa sAutoZIndex>::createHandler()); 2347 setPropertyHandler(CSSPropertyZIndex, ApplyPropertyAuto<int, &RenderStyle::z Index, &RenderStyle::setZIndex, &RenderStyle::hasAutoZIndex, &RenderStyle::setHa sAutoZIndex>::createHandler());
2348 setPropertyHandler(CSSPropertyZoom, ApplyPropertyZoom::createHandler()); 2348 setPropertyHandler(CSSPropertyZoom, ApplyPropertyZoom::createHandler());
2349 } 2349 }
2350 2350
2351 2351
2352 } 2352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698