Source/core/html/shadow/MediaControlsChromiumAndroid.cpp - Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/core/html/shadow/MediaControlsChromiumAndroid.cpp

Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/html/shadow/MediaControlsChromium.cpp ('k') | Source/core/html/track/InbandTextTrack.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87	87

88 void MediaControlsChromiumAndroid::playbackStopped()	88 void MediaControlsChromiumAndroid::playbackStopped()

89 {	89 {

90 m_overlayPlayButton->updateDisplayType();	90 m_overlayPlayButton->updateDisplayType();

91 MediaControlsChromium::playbackStopped();	91 MediaControlsChromium::playbackStopped();

92 }	92 }

93	93

94 void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaCont rolTextTrackContainerElement> textTrackContainer)	94 void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaCont rolTextTrackContainerElement> textTrackContainer)

95 {	95 {

96 // Insert it before the overlay play button so it always displays behind it.	96 // Insert it before the overlay play button so it always displays behind it.

97 m_overlayEnclosure->insertBefore(textTrackContainer, m_overlayPlayButton, AS SERT_NO_EXCEPTION_STATE, AttachLazily);	97 m_overlayEnclosure->insertBefore(textTrackContainer, m_overlayPlayButton, AS SERT_NO_EXCEPTION, AttachLazily);

98 }	98 }

99 }	99 }

OLD	NEW