third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h - Issue 1079323002: Support text track selection in video controls

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

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Blink repo changes and addressed comments from philipj and UX Created 4 years, 10 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

« third_party/WebKit/LayoutTests/media/track/text-track-selection-menu-multiple-tracks.html ('K') | « third_party/WebKit/LayoutTests/media/video-controls-track-selection-menu-expected.txt ('k') | third_party/WebKit/Source/core/css/CSSSelector.cpp » ('j') | third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 438 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
449 break;	449 break;

450 case MediaFullScreenVolumeSliderThumbPart:	450 case MediaFullScreenVolumeSliderThumbPart:

451 m_value.valueID = CSSValueMediaFullscreenVolumeSliderThumb;	451 m_value.valueID = CSSValueMediaFullscreenVolumeSliderThumb;

452 break;	452 break;

453 case MediaCurrentTimePart:	453 case MediaCurrentTimePart:

454 m_value.valueID = CSSValueMediaCurrentTimeDisplay;	454 m_value.valueID = CSSValueMediaCurrentTimeDisplay;

455 break;	455 break;

456 case MediaTimeRemainingPart:	456 case MediaTimeRemainingPart:

457 m_value.valueID = CSSValueMediaTimeRemainingDisplay;	457 m_value.valueID = CSSValueMediaTimeRemainingDisplay;

458 break;	458 break;

	459 case MediaTrackSelectionCheckmarkPart:

	460 m_value.valueID = CSSValueMediaTrackSelectionCheckmark;

	461 break;

	462 case MediaClosedCaptionsIconPart:

	463 m_value.valueID = CSSValueMediaClosedCaptionsIcon;

	464 break;

	465 case MediaSubtitlesIconPart:

	466 m_value.valueID = CSSValueMediaSubtitlesIcon;

	467 break;

459 case MenulistPart:	468 case MenulistPart:

460 m_value.valueID = CSSValueMenulist;	469 m_value.valueID = CSSValueMenulist;

461 break;	470 break;

462 case MenulistButtonPart:	471 case MenulistButtonPart:

463 m_value.valueID = CSSValueMenulistButton;	472 m_value.valueID = CSSValueMenulistButton;

464 break;	473 break;

465 case MenulistTextPart:	474 case MenulistTextPart:

466 m_value.valueID = CSSValueMenulistText;	475 m_value.valueID = CSSValueMenulistText;

467 break;	476 break;

468 case MenulistTextFieldPart:	477 case MenulistTextFieldPart:

(...skipping 4158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4627 default:	4636 default:

4628 break;	4637 break;

4629 }	4638 }

4630 ASSERT_NOT_REACHED();	4639 ASSERT_NOT_REACHED();

4631 return ContainsNone;	4640 return ContainsNone;

4632 }	4641 }

4633	4642

4634 } // namespace blink	4643 } // namespace blink

4635	4644

4636 #endif	4645 #endif

OLD	NEW