Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

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

Issue 177423011: Remove MediaControlVolumeSliderElement::m_clearMutedOnUserInteraction (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/MediaControlElementTypes.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 return false; 109 return false;
110 110
111 RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPan elMuteButtonElement::create(document, this); 111 RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPan elMuteButtonElement::create(document, this);
112 m_panelMuteButton = panelMuteButton.get(); 112 m_panelMuteButton = panelMuteButton.get();
113 panel->appendChild(panelMuteButton.release(), exceptionState); 113 panel->appendChild(panelMuteButton.release(), exceptionState);
114 if (exceptionState.hadException()) 114 if (exceptionState.hadException())
115 return false; 115 return false;
116 116
117 RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolum eSliderElement::create(document); 117 RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolum eSliderElement::create(document);
118 m_volumeSlider = slider.get(); 118 m_volumeSlider = slider.get();
119 m_volumeSlider->setClearMutedOnUserInteraction(true);
120 panel->appendChild(slider.release(), exceptionState); 119 panel->appendChild(slider.release(), exceptionState);
121 if (exceptionState.hadException()) 120 if (exceptionState.hadException())
122 return false; 121 return false;
123 122
124 RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsBu tton = MediaControlToggleClosedCaptionsButtonElement::create(document, this); 123 RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsBu tton = MediaControlToggleClosedCaptionsButtonElement::create(document, this);
125 m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get(); 124 m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
126 panel->appendChild(toggleClosedCaptionsButton.release(), exceptionState); 125 panel->appendChild(toggleClosedCaptionsButton.release(), exceptionState);
127 if (exceptionState.hadException()) 126 if (exceptionState.hadException())
128 return false; 127 return false;
129 128
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 m_textDisplayContainer->updateDisplay(); 464 m_textDisplayContainer->updateDisplay();
466 } 465 }
467 466
468 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon tainerElement> textTrackContainer) 467 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon tainerElement> textTrackContainer)
469 { 468 {
470 // Insert it before the first controller element so it always displays behin d the controls. 469 // Insert it before the first controller element so it always displays behin d the controls.
471 insertBefore(textTrackContainer, m_enclosure); 470 insertBefore(textTrackContainer, m_enclosure);
472 } 471 }
473 472
474 } 473 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElementTypes.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698