Use HTMLMediaElement::togglePlayState() where appropriate

Source/core/html/HTMLMediaElement.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 108 matching lines @@
 
     // ready state
     enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
     ReadyState readyState() const;
     bool seeking() const;
 
     // playback state
     virtual double currentTime() const OVERRIDE FINAL;
     virtual void setCurrentTime(double, ExceptionState&) OVERRIDE FINAL;
     virtual double duration() const OVERRIDE FINAL;
-    virtual bool paused() const OVERRIDE FINAL;
+    bool paused() const;
     double defaultPlaybackRate() const;
     void setDefaultPlaybackRate(double);
     double playbackRate() const;
     void setPlaybackRate(double);
     void updatePlaybackRate();
     PassRefPtr<TimeRanges> played();
     PassRefPtr<TimeRanges> seekable() const;
     bool ended() const;
     bool autoplay() const;
     bool loop() const;
     void setLoop(bool b);
-    virtual void play() OVERRIDE FINAL;
-    virtual void pause() OVERRIDE FINAL;
+    void play();
+    void pause();
 
     // statistics
     unsigned webkitAudioDecodedByteCount() const;
     unsigned webkitVideoDecodedByteCount() const;
 
     // media source extensions
     void closeMediaSource();
     void durationChanged(double duration);
 
     // controls
     bool controls() const;
     void setControls(bool);
     virtual double volume() const OVERRIDE FINAL;
     virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL;
     virtual bool muted() const OVERRIDE FINAL;
     virtual void setMuted(bool) OVERRIDE FINAL;
 
-    virtual bool canPlay() const OVERRIDE FINAL;
-
+    bool togglePlayStateWillPlay() const;

[acolwell GONE FROM CHROMIUM, 2014/03/28 01:02:52]

nit: How about togglePlayStateWillTriggerPlay() or a descriptive comment here
that indiciates something similar.

[philipj_slow, 2014/03/28 07:22:23]

I added a comment to explain briefly what these two functions are for, I hope
that's better.

     void togglePlayState();
 
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicString& label, const AtomicString& language, ExceptionState&);
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicString& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, emptyAtom, exceptionState); }
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionState); }
 
     TextTrackList* textTracks();
     CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
 
     void addTextTrack(TextTrack*);
@@ skipping 381 matching lines @@
 inline bool isHTMLMediaElement(const HTMLElement& element)
 {
     return isHTMLAudioElement(element) || isHTMLVideoElement(element);
 }
 
 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
 
 } //namespace
 
 #endif