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

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

Issue 11875012: Merge 138902 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « Source/WebCore/ChangeLog ('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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 m_fullScreenButton->hide(); 144 m_fullScreenButton->hide();
145 } 145 }
146 146
147 void MediaControls::loadedMetadata() 147 void MediaControls::loadedMetadata()
148 { 148 {
149 reset(); 149 reset();
150 } 150 }
151 151
152 void MediaControls::show() 152 void MediaControls::show()
153 { 153 {
154 makeOpaque();
154 m_panel->setIsDisplayed(true); 155 m_panel->setIsDisplayed(true);
155 m_panel->show(); 156 m_panel->show();
156 } 157 }
157 158
158 void MediaControls::hide() 159 void MediaControls::hide()
159 { 160 {
160 m_panel->setIsDisplayed(false); 161 m_panel->setIsDisplayed(false);
161 m_panel->hide(); 162 m_panel->hide();
162 } 163 }
163 164
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (!m_textDisplayContainer) 394 if (!m_textDisplayContainer)
394 createTextTrackDisplay(); 395 createTextTrackDisplay();
395 396
396 m_textDisplayContainer->updateDisplay(); 397 m_textDisplayContainer->updateDisplay();
397 } 398 }
398 #endif 399 #endif
399 400
400 } 401 }
401 402
402 #endif 403 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698