Source/WebCore/html/HTMLMediaElement.h - Issue 11368088: Merge 133262 - Build fix. http://trac.webkit.org/changeset/133252 broke the Windows build.

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

Issue 11368088: Merge 133262 - Build fix. http://trac.webkit.org/changeset/133252 broke the Windows build. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years, 1 month 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 | « Source/WebCore/ChangeLog ('k') | Source/WebCore/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.	2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.

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 446 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
457	457

458 void scheduleTimeupdateEvent(bool periodicEvent);	458 void scheduleTimeupdateEvent(bool periodicEvent);

459 void scheduleEvent(const AtomicString& eventName);	459 void scheduleEvent(const AtomicString& eventName);

460	460

461 // loading	461 // loading

462 void selectMediaResource();	462 void selectMediaResource();

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

464 void scheduleNextSourceChild();	464 void scheduleNextSourceChild();

465 void loadNextSourceChild();	465 void loadNextSourceChild();

466 void userCancelledLoad();	466 void userCancelledLoad();

467 void clearMediaPlayer(unsigned flags);	467 void clearMediaPlayer(signed flags);

468 bool havePotentialSourceChild();	468 bool havePotentialSourceChild();

469 void noneSupported();	469 void noneSupported();

470 void mediaEngineError(PassRefPtr<MediaError> err);	470 void mediaEngineError(PassRefPtr<MediaError> err);

471 void cancelPendingEventsAndCallbacks();	471 void cancelPendingEventsAndCallbacks();

472 void waitForSourceChange();	472 void waitForSourceChange();

473 void prepareToPlay();	473 void prepareToPlay();

474	474

475 KURL selectNextSourceChild(ContentType, String keySystem, InvalidURLAction );	475 KURL selectNextSourceChild(ContentType, String keySystem, InvalidURLAction );

476	476

477 void mediaLoadingFailed(MediaPlayer::NetworkState);	477 void mediaLoadingFailed(MediaPlayer::NetworkState);

(...skipping 233 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
711 inline HTMLMediaElement* toMediaElement(Node* node)	711 inline HTMLMediaElement* toMediaElement(Node* node)

712 {	712 {

713 ASSERT(!node \|\| isMediaElement(node));	713 ASSERT(!node \|\| isMediaElement(node));

714 return static_cast<HTMLMediaElement*>(node);	714 return static_cast<HTMLMediaElement*>(node);

715 }	715 }

716	716

717 } //namespace	717 } //namespace

718	718

719 #endif	719 #endif

720 #endif	720 #endif

OLD	NEW