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

Side by Side Diff: Source/core/html/HTMLMediaElement.h

Issue 217103004: Ignore MediaController in the muted/volume controls logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: repaint in updateVolume Created 6 years, 8 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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 static void setMediaStreamRegistry(URLRegistry*); 79 static void setMediaStreamRegistry(URLRegistry*);
80 static bool isMediaStreamURL(const String& url); 80 static bool isMediaStreamURL(const String& url);
81 81
82 // Do not use player(). 82 // Do not use player().
83 // FIXME: Replace all uses with webMediaPlayer() and remove this API. 83 // FIXME: Replace all uses with webMediaPlayer() and remove this API.
84 MediaPlayer* player() const { return m_player.get(); } 84 MediaPlayer* player() const { return m_player.get(); }
85 blink::WebMediaPlayer* webMediaPlayer() const { return m_player ? m_player-> webMediaPlayer() : 0; } 85 blink::WebMediaPlayer* webMediaPlayer() const { return m_player ? m_player-> webMediaPlayer() : 0; }
86 86
87 virtual bool hasVideo() const { return false; } 87 virtual bool hasVideo() const { return false; }
88 virtual bool hasAudio() const OVERRIDE FINAL; 88 bool hasAudio() const;
89 89
90 bool supportsSave() const; 90 bool supportsSave() const;
91 91
92 blink::WebLayer* platformLayer() const; 92 blink::WebLayer* platformLayer() const;
93 93
94 enum DelayedActionType { 94 enum DelayedActionType {
95 LoadMediaResource = 1 << 0, 95 LoadMediaResource = 1 << 0,
96 LoadTextTrackResource = 1 << 1, 96 LoadTextTrackResource = 1 << 1,
97 TextTrackChangesNotification = 1 << 2 97 TextTrackChangesNotification = 1 << 2
98 }; 98 };
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 unsigned webkitAudioDecodedByteCount() const; 145 unsigned webkitAudioDecodedByteCount() const;
146 unsigned webkitVideoDecodedByteCount() const; 146 unsigned webkitVideoDecodedByteCount() const;
147 147
148 // media source extensions 148 // media source extensions
149 void closeMediaSource(); 149 void closeMediaSource();
150 void durationChanged(double duration); 150 void durationChanged(double duration);
151 151
152 // controls 152 // controls
153 bool controls() const; 153 bool controls() const;
154 void setControls(bool); 154 void setControls(bool);
155 virtual double volume() const OVERRIDE FINAL; 155 double volume() const;
156 virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL; 156 void setVolume(double, ExceptionState&);
157 virtual bool muted() const OVERRIDE FINAL; 157 bool muted() const;
158 virtual void setMuted(bool) OVERRIDE FINAL; 158 void setMuted(bool);
159 159
160 // play/pause toggling that uses the media controller if present. togglePlay StateWillPlay() is 160 // play/pause toggling that uses the media controller if present. togglePlay StateWillPlay() is
161 // true if togglePlayState() will call play() or unpause() on the media elem ent or controller. 161 // true if togglePlayState() will call play() or unpause() on the media elem ent or controller.
162 bool togglePlayStateWillPlay() const; 162 bool togglePlayStateWillPlay() const;
163 void togglePlayState(); 163 void togglePlayState();
164 164
165 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, const AtomicString& language, ExceptionState&); 165 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, const AtomicString& language, ExceptionState&);
166 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, e mptyAtom, exceptionState); } 166 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicStr ing& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, e mptyAtom, exceptionState); }
167 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); } 167 PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionStat e); }
168 168
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 inline bool isHTMLMediaElement(const HTMLElement& element) 555 inline bool isHTMLMediaElement(const HTMLElement& element)
556 { 556 {
557 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 557 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
558 } 558 }
559 559
560 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 560 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
561 561
562 } //namespace 562 } //namespace
563 563
564 #endif 564 #endif
OLDNEW
« no previous file with comments | « LayoutTests/media/media-volume-slider-hit-test-expected.txt ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698