| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. | 2 * Copyright (C) 2009 Apple Inc. |
| 3 * Copyright (C) 2009 Google Inc. | 3 * Copyright (C) 2009 Google Inc. |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 case MediaCastOffButton: | 393 case MediaCastOffButton: |
| 394 case MediaCastOnButton: | 394 case MediaCastOnButton: |
| 395 case MediaOverlayCastOffButton: | 395 case MediaOverlayCastOffButton: |
| 396 case MediaOverlayCastOnButton: | 396 case MediaOverlayCastOnButton: |
| 397 return paintMediaCastButton(object, paintInfo, rect); | 397 return paintMediaCastButton(object, paintInfo, rect); |
| 398 case MediaVolumeSliderContainer: | 398 case MediaVolumeSliderContainer: |
| 399 case MediaTimelineContainer: | 399 case MediaTimelineContainer: |
| 400 case MediaCurrentTimeDisplay: | 400 case MediaCurrentTimeDisplay: |
| 401 case MediaTimeRemainingDisplay: | 401 case MediaTimeRemainingDisplay: |
| 402 case MediaControlsPanel: | 402 case MediaControlsPanel: |
| 403 case MediaStatusDisplay: | |
| 404 case MediaHideClosedCaptionsButton: | 403 case MediaHideClosedCaptionsButton: |
| 405 case MediaTextTrackDisplayContainer: | 404 case MediaTextTrackDisplayContainer: |
| 406 case MediaTextTrackDisplay: | |
| 407 case MediaFullScreenVolumeSlider: | 405 case MediaFullScreenVolumeSlider: |
| 408 case MediaFullScreenVolumeSliderThumb: | 406 case MediaFullScreenVolumeSliderThumb: |
| 409 ASSERT_NOT_REACHED(); | 407 ASSERT_NOT_REACHED(); |
| 410 break; | 408 break; |
| 411 } | 409 } |
| 412 return false; | 410 return false; |
| 413 } | 411 } |
| 414 | 412 |
| 415 const int mediaSliderThumbHeight = 24; | 413 const int mediaSliderThumbHeight = 24; |
| 416 const int mediaVolumeSliderThumbHeight = 24; | 414 const int mediaVolumeSliderThumbHeight = 24; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 { | 466 { |
| 469 return formatChromiumMediaControlsTime(time, time); | 467 return formatChromiumMediaControlsTime(time, time); |
| 470 } | 468 } |
| 471 | 469 |
| 472 String LayoutMediaControls::formatMediaControlsCurrentTime(float currentTime, fl
oat duration) | 470 String LayoutMediaControls::formatMediaControlsCurrentTime(float currentTime, fl
oat duration) |
| 473 { | 471 { |
| 474 return formatChromiumMediaControlsTime(currentTime, duration); | 472 return formatChromiumMediaControlsTime(currentTime, duration); |
| 475 } | 473 } |
| 476 | 474 |
| 477 } // namespace blink | 475 } // namespace blink |
| OLD | NEW |