Source/core/css/CSSPrimitiveValueMappings.h - Issue 1094863007: Implement "word-break: keep-all" in CSS3 Text

Side by Side Diff: Source/core/css/CSSPrimitiveValueMappings.h

Issue 1094863007: Implement "word-break: keep-all" in CSS3 Text (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Replace custom SA charset detecting function to already existing one Created 5 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

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 2617 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2628 switch (e) {	2628 switch (e) {

2629 case NormalWordBreak:	2629 case NormalWordBreak:

2630 m_value.valueID = CSSValueNormal;	2630 m_value.valueID = CSSValueNormal;

2631 break;	2631 break;

2632 case BreakAllWordBreak:	2632 case BreakAllWordBreak:

2633 m_value.valueID = CSSValueBreakAll;	2633 m_value.valueID = CSSValueBreakAll;

2634 break;	2634 break;

2635 case BreakWordBreak:	2635 case BreakWordBreak:

2636 m_value.valueID = CSSValueBreakWord;	2636 m_value.valueID = CSSValueBreakWord;

2637 break;	2637 break;

	2638 case KeepAllWordBreak:

	2639 m_value.valueID = CSSValueKeepAll;

	2640 break;

2638 }	2641 }

2639 }	2642 }

2640	2643

2641 template<> inline CSSPrimitiveValue::operator EWordBreak() const	2644 template<> inline CSSPrimitiveValue::operator EWordBreak() const

2642 {	2645 {

2643 ASSERT(isValueID());	2646 ASSERT(isValueID());

2644 switch (m_value.valueID) {	2647 switch (m_value.valueID) {

2645 case CSSValueBreakAll:	2648 case CSSValueBreakAll:

2646 return BreakAllWordBreak;	2649 return BreakAllWordBreak;

2647 case CSSValueBreakWord:	2650 case CSSValueBreakWord:

2648 return BreakWordBreak;	2651 return BreakWordBreak;

2649 case CSSValueNormal:	2652 case CSSValueNormal:

2650 return NormalWordBreak;	2653 return NormalWordBreak;

	2654 case CSSValueKeepAll:

	2655 return KeepAllWordBreak;

2651 default:	2656 default:

2652 break;	2657 break;

2653 }	2658 }

2654	2659

2655 ASSERT_NOT_REACHED();	2660 ASSERT_NOT_REACHED();

2656 return NormalWordBreak;	2661 return NormalWordBreak;

2657 }	2662 }

2658	2663

2659 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflowWrap e)	2664 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflowWrap e)

2660 : CSSValue(PrimitiveClass)	2665 : CSSValue(PrimitiveClass)

(...skipping 2040 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4701 default:	4706 default:

4702 break;	4707 break;

4703 }	4708 }

4704 ASSERT_NOT_REACHED();	4709 ASSERT_NOT_REACHED();

4705 return ScrollBehaviorAuto;	4710 return ScrollBehaviorAuto;

4706 }	4711 }

4707	4712

4708 }	4713 }

4709	4714

4710 #endif	4715 #endif

OLD	NEW