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 13 matching lines...) Expand all Loading... |
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include "config.h" | 28 #include "config.h" |
29 #include "core/rendering/RenderMediaControls.h" | 29 #include "core/rendering/RenderMediaControls.h" |
30 | 30 |
31 #include "bindings/v8/ExceptionStatePlaceholder.h" | 31 #include "bindings/v8/ExceptionStatePlaceholder.h" |
32 #include "core/html/HTMLMediaElement.h" | 32 #include "core/html/HTMLMediaElement.h" |
33 #include "core/html/TimeRanges.h" | 33 #include "core/html/TimeRanges.h" |
34 #include "core/platform/graphics/Gradient.h" | |
35 #include "core/platform/graphics/GraphicsContext.h" | |
36 #include "core/rendering/PaintInfo.h" | 34 #include "core/rendering/PaintInfo.h" |
| 35 #include "platform/graphics/Gradient.h" |
| 36 #include "platform/graphics/GraphicsContext.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 typedef WTF::HashMap<const char*, Image*> MediaControlImageMap; | 40 typedef WTF::HashMap<const char*, Image*> MediaControlImageMap; |
41 static MediaControlImageMap* gMediaControlImageMap = 0; | 41 static MediaControlImageMap* gMediaControlImageMap = 0; |
42 | 42 |
43 static Image* platformResource(const char* name) | 43 static Image* platformResource(const char* name) |
44 { | 44 { |
45 if (!gMediaControlImageMap) | 45 if (!gMediaControlImageMap) |
46 gMediaControlImageMap = new MediaControlImageMap(); | 46 gMediaControlImageMap = new MediaControlImageMap(); |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 { | 443 { |
444 return formatChromiumMediaControlsTime(time, time); | 444 return formatChromiumMediaControlsTime(time, time); |
445 } | 445 } |
446 | 446 |
447 String RenderMediaControls::formatMediaControlsCurrentTime(float currentTime, fl
oat duration) | 447 String RenderMediaControls::formatMediaControlsCurrentTime(float currentTime, fl
oat duration) |
448 { | 448 { |
449 return formatChromiumMediaControlsTime(currentTime, duration); | 449 return formatChromiumMediaControlsTime(currentTime, duration); |
450 } | 450 } |
451 | 451 |
452 } // namespace WebCore | 452 } // namespace WebCore |
OLD | NEW |