| OLD | NEW |
| 1 /** | 1 /** |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 borderWidthShorthand()); | 220 borderWidthShorthand()); |
| 221 case CSSPropertyWebkitBorderStartWidth: | 221 case CSSPropertyWebkitBorderStartWidth: |
| 222 return ResolveToPhysicalProperty(direction, writing_mode, kStartSide, | 222 return ResolveToPhysicalProperty(direction, writing_mode, kStartSide, |
| 223 borderWidthShorthand()); | 223 borderWidthShorthand()); |
| 224 case CSSPropertyWebkitBorderBeforeWidth: | 224 case CSSPropertyWebkitBorderBeforeWidth: |
| 225 return ResolveToPhysicalProperty(direction, writing_mode, kBeforeSide, | 225 return ResolveToPhysicalProperty(direction, writing_mode, kBeforeSide, |
| 226 borderWidthShorthand()); | 226 borderWidthShorthand()); |
| 227 case CSSPropertyWebkitBorderAfterWidth: | 227 case CSSPropertyWebkitBorderAfterWidth: |
| 228 return ResolveToPhysicalProperty(direction, writing_mode, kAfterSide, | 228 return ResolveToPhysicalProperty(direction, writing_mode, kAfterSide, |
| 229 borderWidthShorthand()); | 229 borderWidthShorthand()); |
| 230 case CSSPropertyScrollPaddingInlineStart: |
| 231 return ResolveToPhysicalProperty(direction, writing_mode, kStartSide, |
| 232 scrollPaddingShorthand()); |
| 233 case CSSPropertyScrollPaddingInlineEnd: |
| 234 return ResolveToPhysicalProperty(direction, writing_mode, kEndSide, |
| 235 scrollPaddingShorthand()); |
| 236 case CSSPropertyScrollPaddingBlockStart: |
| 237 return ResolveToPhysicalProperty(direction, writing_mode, kBeforeSide, |
| 238 scrollPaddingShorthand()); |
| 239 case CSSPropertyScrollPaddingBlockEnd: |
| 240 return ResolveToPhysicalProperty(direction, writing_mode, kAfterSide, |
| 241 scrollPaddingShorthand()); |
| 242 case CSSPropertyScrollSnapMarginInlineStart: |
| 243 return ResolveToPhysicalProperty(direction, writing_mode, kStartSide, |
| 244 scrollSnapMarginShorthand()); |
| 245 case CSSPropertyScrollSnapMarginInlineEnd: |
| 246 return ResolveToPhysicalProperty(direction, writing_mode, kEndSide, |
| 247 scrollSnapMarginShorthand()); |
| 248 case CSSPropertyScrollSnapMarginBlockStart: |
| 249 return ResolveToPhysicalProperty(direction, writing_mode, kBeforeSide, |
| 250 scrollSnapMarginShorthand()); |
| 251 case CSSPropertyScrollSnapMarginBlockEnd: |
| 252 return ResolveToPhysicalProperty(direction, writing_mode, kAfterSide, |
| 253 scrollSnapMarginShorthand()); |
| 230 case CSSPropertyInlineSize: | 254 case CSSPropertyInlineSize: |
| 231 case CSSPropertyWebkitLogicalWidth: { | 255 case CSSPropertyWebkitLogicalWidth: { |
| 232 const CSSPropertyID kProperties[2] = {CSSPropertyWidth, | 256 const CSSPropertyID kProperties[2] = {CSSPropertyWidth, |
| 233 CSSPropertyHeight}; | 257 CSSPropertyHeight}; |
| 234 return ResolveToPhysicalProperty(writing_mode, kLogicalWidth, | 258 return ResolveToPhysicalProperty(writing_mode, kLogicalWidth, |
| 235 kProperties); | 259 kProperties); |
| 236 } | 260 } |
| 237 case CSSPropertyBlockSize: | 261 case CSSPropertyBlockSize: |
| 238 case CSSPropertyWebkitLogicalHeight: { | 262 case CSSPropertyWebkitLogicalHeight: { |
| 239 const CSSPropertyID kProperties[2] = {CSSPropertyWidth, | 263 const CSSPropertyID kProperties[2] = {CSSPropertyWidth, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 return property_id != CSSPropertyUnicodeBidi && | 320 return property_id != CSSPropertyUnicodeBidi && |
| 297 property_id != CSSPropertyDirection; | 321 property_id != CSSPropertyDirection; |
| 298 } | 322 } |
| 299 | 323 |
| 300 bool CSSProperty::operator==(const CSSProperty& other) const { | 324 bool CSSProperty::operator==(const CSSProperty& other) const { |
| 301 return DataEquivalent(value_, other.value_) && | 325 return DataEquivalent(value_, other.value_) && |
| 302 IsImportant() == other.IsImportant(); | 326 IsImportant() == other.IsImportant(); |
| 303 } | 327 } |
| 304 | 328 |
| 305 } // namespace blink | 329 } // namespace blink |
| OLD | NEW |