third_party/WebKit/Source/core/html/HTMLMediaElement.h - Issue 1481913002: Remove userCancelledLoad and refactor the code at the call sites

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

Issue 1481913002: Remove userCancelledLoad and refactor the code at the call sites (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address nits Created 5 years 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

« no previous file with comments | « third_party/WebKit/LayoutTests/media/video-move-to-new-document.html ('k') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 338 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
349 // loading	349 // loading

350 void prepareForLoad();	350 void prepareForLoad();

351 void loadInternal();	351 void loadInternal();

352 void selectMediaResource();	352 void selectMediaResource();

353 void loadResource(const KURL&, ContentType&, const String& keySystem);	353 void loadResource(const KURL&, ContentType&, const String& keySystem);

354 void startPlayerLoad();	354 void startPlayerLoad();

355 void setPlayerPreload();	355 void setPlayerPreload();

356 WebMediaPlayer::LoadType loadType() const;	356 WebMediaPlayer::LoadType loadType() const;

357 void scheduleNextSourceChild();	357 void scheduleNextSourceChild();

358 void loadNextSourceChild();	358 void loadNextSourceChild();

359 void userCancelledLoad();

360 void clearMediaPlayer(int flags);	359 void clearMediaPlayer(int flags);

361 void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();	360 void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();

362 bool havePotentialSourceChild();	361 bool havePotentialSourceChild();

363 void noneSupported();	362 void noneSupported();

364 void mediaEngineError(MediaError*);	363 void mediaEngineError(MediaError*);

365 void cancelPendingEventsAndCallbacks();	364 void cancelPendingEventsAndCallbacks();

366 void waitForSourceChange();	365 void waitForSourceChange();

367 void prepareToPlay();	366 void prepareToPlay();

368	367

369 KURL selectNextSourceChild(ContentType, String keySystem, InvalidURLAction );	368 KURL selectNextSourceChild(ContentType, String keySystem, InvalidURLAction );

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
628 inline bool isHTMLMediaElement(const HTMLElement& element)	627 inline bool isHTMLMediaElement(const HTMLElement& element)

629 {	628 {

630 return isHTMLAudioElement(element) \|\| isHTMLVideoElement(element);	629 return isHTMLAudioElement(element) \|\| isHTMLVideoElement(element);

631 }	630 }

632	631

633 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);	632 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);

634	633

635 } // namespace blink	634 } // namespace blink

636	635

637 #endif // HTMLMediaElement_h	636 #endif // HTMLMediaElement_h

OLD	NEW