| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. | 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. |
| 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> | 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
| 9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
| 10 * are met: | 10 * are met: |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 switch (e) { | 341 switch (e) { |
| 342 case BorderFillBox: | 342 case BorderFillBox: |
| 343 m_value.valueID = CSSValueBorderBox; | 343 m_value.valueID = CSSValueBorderBox; |
| 344 break; | 344 break; |
| 345 case PaddingFillBox: | 345 case PaddingFillBox: |
| 346 m_value.valueID = CSSValuePaddingBox; | 346 m_value.valueID = CSSValuePaddingBox; |
| 347 break; | 347 break; |
| 348 case ContentFillBox: | 348 case ContentFillBox: |
| 349 m_value.valueID = CSSValueContentBox; | 349 m_value.valueID = CSSValueContentBox; |
| 350 break; | 350 break; |
| 351 case TextFillBox: | |
| 352 m_value.valueID = CSSValueText; | |
| 353 break; | |
| 354 } | 351 } |
| 355 } | 352 } |
| 356 | 353 |
| 357 template<> inline CSSPrimitiveValue::operator EFillBox() const | 354 template<> inline CSSPrimitiveValue::operator EFillBox() const |
| 358 { | 355 { |
| 359 ASSERT(isValueID()); | 356 ASSERT(isValueID()); |
| 360 switch (m_value.valueID) { | 357 switch (m_value.valueID) { |
| 361 case CSSValueBorder: | 358 case CSSValueBorder: |
| 362 case CSSValueBorderBox: | 359 case CSSValueBorderBox: |
| 363 return BorderFillBox; | 360 return BorderFillBox; |
| 364 case CSSValuePadding: | 361 case CSSValuePadding: |
| 365 case CSSValuePaddingBox: | 362 case CSSValuePaddingBox: |
| 366 return PaddingFillBox; | 363 return PaddingFillBox; |
| 367 case CSSValueContent: | 364 case CSSValueContent: |
| 368 case CSSValueContentBox: | 365 case CSSValueContentBox: |
| 369 return ContentFillBox; | 366 return ContentFillBox; |
| 370 case CSSValueText: | |
| 371 return TextFillBox; | |
| 372 default: | 367 default: |
| 373 break; | 368 break; |
| 374 } | 369 } |
| 375 | 370 |
| 376 ASSERT_NOT_REACHED(); | 371 ASSERT_NOT_REACHED(); |
| 377 return BorderFillBox; | 372 return BorderFillBox; |
| 378 } | 373 } |
| 379 | 374 |
| 380 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillRepeat e) | 375 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillRepeat e) |
| 381 : CSSValue(PrimitiveClass) | 376 : CSSValue(PrimitiveClass) |
| (...skipping 3093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3475 default: | 3470 default: |
| 3476 break; | 3471 break; |
| 3477 } | 3472 } |
| 3478 ASSERT_NOT_REACHED(); | 3473 ASSERT_NOT_REACHED(); |
| 3479 return ScrollBehaviorInstant; | 3474 return ScrollBehaviorInstant; |
| 3480 } | 3475 } |
| 3481 | 3476 |
| 3482 } | 3477 } |
| 3483 | 3478 |
| 3484 #endif // SKY_ENGINE_CORE_CSS_CSSPRIMITIVEVALUEMAPPINGS_H_ | 3479 #endif // SKY_ENGINE_CORE_CSS_CSSPRIMITIVEVALUEMAPPINGS_H_ |
| OLD | NEW |