| 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 4447 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4458     case CSSValueIsolate: |  4458     case CSSValueIsolate: | 
|  4459         return IsolationIsolate; |  4459         return IsolationIsolate; | 
|  4460     default: |  4460     default: | 
|  4461         break; |  4461         break; | 
|  4462     } |  4462     } | 
|  4463  |  4463  | 
|  4464     ASSERT_NOT_REACHED(); |  4464     ASSERT_NOT_REACHED(); | 
|  4465     return IsolationAuto; |  4465     return IsolationAuto; | 
|  4466 } |  4466 } | 
|  4467  |  4467  | 
|  4468 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchActionDelay t) |  4468 template<> inline CSSPrimitiveValue::operator ScrollBlocksOn() const | 
|  4469     : CSSValue(PrimitiveClass) |  | 
|  4470 { |  | 
|  4471     m_primitiveUnitType = CSS_VALUE_ID; |  | 
|  4472     switch (t) { |  | 
|  4473     case TouchActionDelayNone: |  | 
|  4474         m_value.valueID = CSSValueNone; |  | 
|  4475         break; |  | 
|  4476     case TouchActionDelayScript: |  | 
|  4477         m_value.valueID = CSSValueScript; |  | 
|  4478         break; |  | 
|  4479     } |  | 
|  4480 } |  | 
|  4481  |  | 
|  4482 template<> inline CSSPrimitiveValue::operator TouchActionDelay() const |  | 
|  4483 { |  4469 { | 
|  4484     switch (m_value.valueID) { |  4470     switch (m_value.valueID) { | 
|  4485     case CSSValueNone: |  4471     case CSSValueNone: | 
|  4486         return TouchActionDelayNone; |  4472         return ScrollBlocksOnNone; | 
|  4487     case CSSValueScript: |  4473     case CSSValueStartTouch: | 
|  4488         return TouchActionDelayScript; |  4474         return ScrollBlocksOnStartTouch; | 
 |  4475     case CSSValueWheelEvent: | 
 |  4476         return ScrollBlocksOnWheelEvent; | 
 |  4477     case CSSValueScrollEvent: | 
 |  4478         return ScrollBlocksOnScrollEvent; | 
|  4489     default: |  4479     default: | 
|  4490         break; |  4480         break; | 
|  4491     } |  4481     } | 
|  4492  |  4482  | 
|  4493     ASSERT_NOT_REACHED(); |  4483     ASSERT_NOT_REACHED(); | 
|  4494     return TouchActionDelayNone; |  4484     return ScrollBlocksOnNone; | 
|  4495 } |  4485 } | 
|  4496  |  4486  | 
|  4497 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox) |  4487 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox) | 
|  4498     : CSSValue(PrimitiveClass) |  4488     : CSSValue(PrimitiveClass) | 
|  4499 { |  4489 { | 
|  4500     m_primitiveUnitType = CSS_VALUE_ID; |  4490     m_primitiveUnitType = CSS_VALUE_ID; | 
|  4501     switch (cssBox) { |  4491     switch (cssBox) { | 
|  4502     case MarginBox: |  4492     case MarginBox: | 
|  4503         m_value.valueID = CSSValueMarginBox; |  4493         m_value.valueID = CSSValueMarginBox; | 
|  4504         break; |  4494         break; | 
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4786     default: |  4776     default: | 
|  4787         break; |  4777         break; | 
|  4788     } |  4778     } | 
|  4789     ASSERT_NOT_REACHED(); |  4779     ASSERT_NOT_REACHED(); | 
|  4790     return ScrollBehaviorInstant; |  4780     return ScrollBehaviorInstant; | 
|  4791 } |  4781 } | 
|  4792  |  4782  | 
|  4793 } |  4783 } | 
|  4794  |  4784  | 
|  4795 #endif |  4785 #endif | 
| OLD | NEW |