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

Side by Side Diff: Source/core/layout/LayoutMediaControls.cpp

Issue 988763002: Start separating the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 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
OLDNEW
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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 MediaHideClosedCaptionsButton: 403 case MediaHideClosedCaptionsButton:
404 case MediaTextTrackDisplayContainer:
405 case MediaFullScreenVolumeSlider: 404 case MediaFullScreenVolumeSlider:
406 case MediaFullScreenVolumeSliderThumb: 405 case MediaFullScreenVolumeSliderThumb:
407 ASSERT_NOT_REACHED(); 406 ASSERT_NOT_REACHED();
408 break; 407 break;
409 } 408 }
410 return false; 409 return false;
411 } 410 }
412 411
413 const int mediaSliderThumbHeight = 24; 412 const int mediaSliderThumbHeight = 24;
414 const int mediaVolumeSliderThumbHeight = 24; 413 const int mediaVolumeSliderThumbHeight = 24;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 { 465 {
467 return formatChromiumMediaControlsTime(time, time); 466 return formatChromiumMediaControlsTime(time, time);
468 } 467 }
469 468
470 String LayoutMediaControls::formatMediaControlsCurrentTime(float currentTime, fl oat duration) 469 String LayoutMediaControls::formatMediaControlsCurrentTime(float currentTime, fl oat duration)
471 { 470 {
472 return formatChromiumMediaControlsTime(currentTime, duration); 471 return formatChromiumMediaControlsTime(currentTime, duration);
473 } 472 }
474 473
475 } // namespace blink 474 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackContainer.cpp ('k') | Source/core/layout/LayoutTextTrackContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698