← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/html/HTMLMediaElement.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/html/HTMLMediaElement.h
39
39
namespace WebCore {
40
40
 
41
41
class Event;
 
42
class HTMLSourceElement;
42
43
class MediaError;
43
44
class KURL;
44
45
class TimeRanges;
178
179
    
179
180
    // loading
180
181
    void selectMediaResource();
181
 
    void loadResource(String url, ContentType& contentType);
 
182
    void loadResource(const KURL&, ContentType&);
182
183
    void loadNextSourceChild();
183
184
    void userCancelledLoad();
184
 
    String nextSourceChild(ContentType* contentType = 0);
185
185
    bool havePotentialSourceChild();
186
186
    void noneSupported();
187
187
    void mediaEngineError(PassRefPtr<MediaError> err);
 
188
    void cancelPendingEventsAndCallbacks();
 
189
 
 
190
    enum InvalidSourceAction { DoNothing, Complain };
 
191
    bool isSafeToLoadURL(const KURL&, InvalidSourceAction);
 
192
    KURL selectNextSourceChild(ContentType*, InvalidSourceAction);
188
193
 
189
194
    // These "internal" functions do not check user gesture restrictions.
190
195
    void loadInternal();
243
248
    // loading state
244
249
    enum LoadState { WaitingForSource, LoadingFromSrcAttr, LoadingFromSourceElement };
245
250
    LoadState m_loadState;
246
 
    Node *m_currentSourceNode;
 
251
    HTMLSourceElement *m_currentSourceNode;
247
252
    
248
253
    OwnPtr<MediaPlayer> m_player;
249
254