| 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 borderWidthShorthand()); | 219 borderWidthShorthand()); |
| 220 case CSSPropertyWebkitBorderStartWidth: | 220 case CSSPropertyWebkitBorderStartWidth: |
| 221 return resolveToPhysicalProperty(direction, writingMode, StartSide, | 221 return resolveToPhysicalProperty(direction, writingMode, StartSide, |
| 222 borderWidthShorthand()); | 222 borderWidthShorthand()); |
| 223 case CSSPropertyWebkitBorderBeforeWidth: | 223 case CSSPropertyWebkitBorderBeforeWidth: |
| 224 return resolveToPhysicalProperty(direction, writingMode, BeforeSide, | 224 return resolveToPhysicalProperty(direction, writingMode, BeforeSide, |
| 225 borderWidthShorthand()); | 225 borderWidthShorthand()); |
| 226 case CSSPropertyWebkitBorderAfterWidth: | 226 case CSSPropertyWebkitBorderAfterWidth: |
| 227 return resolveToPhysicalProperty(direction, writingMode, AfterSide, | 227 return resolveToPhysicalProperty(direction, writingMode, AfterSide, |
| 228 borderWidthShorthand()); | 228 borderWidthShorthand()); |
| 229 case CSSPropertyInlineSize: |
| 229 case CSSPropertyWebkitLogicalWidth: { | 230 case CSSPropertyWebkitLogicalWidth: { |
| 230 const CSSPropertyID properties[2] = {CSSPropertyWidth, CSSPropertyHeight}; | 231 const CSSPropertyID properties[2] = {CSSPropertyWidth, CSSPropertyHeight}; |
| 231 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); | 232 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); |
| 232 } | 233 } |
| 234 case CSSPropertyBlockSize: |
| 233 case CSSPropertyWebkitLogicalHeight: { | 235 case CSSPropertyWebkitLogicalHeight: { |
| 234 const CSSPropertyID properties[2] = {CSSPropertyWidth, CSSPropertyHeight}; | 236 const CSSPropertyID properties[2] = {CSSPropertyWidth, CSSPropertyHeight}; |
| 235 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); | 237 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); |
| 236 } | 238 } |
| 239 case CSSPropertyMinInlineSize: |
| 237 case CSSPropertyWebkitMinLogicalWidth: { | 240 case CSSPropertyWebkitMinLogicalWidth: { |
| 238 const CSSPropertyID properties[2] = {CSSPropertyMinWidth, | 241 const CSSPropertyID properties[2] = {CSSPropertyMinWidth, |
| 239 CSSPropertyMinHeight}; | 242 CSSPropertyMinHeight}; |
| 240 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); | 243 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); |
| 241 } | 244 } |
| 245 case CSSPropertyMinBlockSize: |
| 242 case CSSPropertyWebkitMinLogicalHeight: { | 246 case CSSPropertyWebkitMinLogicalHeight: { |
| 243 const CSSPropertyID properties[2] = {CSSPropertyMinWidth, | 247 const CSSPropertyID properties[2] = {CSSPropertyMinWidth, |
| 244 CSSPropertyMinHeight}; | 248 CSSPropertyMinHeight}; |
| 245 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); | 249 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); |
| 246 } | 250 } |
| 251 case CSSPropertyMaxInlineSize: |
| 247 case CSSPropertyWebkitMaxLogicalWidth: { | 252 case CSSPropertyWebkitMaxLogicalWidth: { |
| 248 const CSSPropertyID properties[2] = {CSSPropertyMaxWidth, | 253 const CSSPropertyID properties[2] = {CSSPropertyMaxWidth, |
| 249 CSSPropertyMaxHeight}; | 254 CSSPropertyMaxHeight}; |
| 250 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); | 255 return resolveToPhysicalProperty(writingMode, LogicalWidth, properties); |
| 251 } | 256 } |
| 257 case CSSPropertyMaxBlockSize: |
| 252 case CSSPropertyWebkitMaxLogicalHeight: { | 258 case CSSPropertyWebkitMaxLogicalHeight: { |
| 253 const CSSPropertyID properties[2] = {CSSPropertyMaxWidth, | 259 const CSSPropertyID properties[2] = {CSSPropertyMaxWidth, |
| 254 CSSPropertyMaxHeight}; | 260 CSSPropertyMaxHeight}; |
| 255 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); | 261 return resolveToPhysicalProperty(writingMode, LogicalHeight, properties); |
| 256 } | 262 } |
| 257 default: | 263 default: |
| 258 return propertyID; | 264 return propertyID; |
| 259 } | 265 } |
| 260 } | 266 } |
| 261 | 267 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 281 return propertyID != CSSPropertyUnicodeBidi && | 287 return propertyID != CSSPropertyUnicodeBidi && |
| 282 propertyID != CSSPropertyDirection; | 288 propertyID != CSSPropertyDirection; |
| 283 } | 289 } |
| 284 | 290 |
| 285 bool CSSProperty::operator==(const CSSProperty& other) const { | 291 bool CSSProperty::operator==(const CSSProperty& other) const { |
| 286 return m_value->equals(*other.m_value) && | 292 return m_value->equals(*other.m_value) && |
| 287 isImportant() == other.isImportant(); | 293 isImportant() == other.isImportant(); |
| 288 } | 294 } |
| 289 | 295 |
| 290 } // namespace blink | 296 } // namespace blink |
| OLD | NEW |