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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/WebKit/chromium/src/AssertMatchingEnums.cpp

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 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
« no previous file with comments | « Source/WebKit/chromium/features.gypi ('k') | Source/WebKit/chromium/src/MediaSourcePrivateImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "HTMLInputElement.h" 55 #include "HTMLInputElement.h"
56 #include "IDBCursor.h" 56 #include "IDBCursor.h"
57 #include "IDBDatabaseBackendInterface.h" 57 #include "IDBDatabaseBackendInterface.h"
58 #include "IDBDatabaseException.h" 58 #include "IDBDatabaseException.h"
59 #include "IDBFactoryBackendInterfaceChromium.h" 59 #include "IDBFactoryBackendInterfaceChromium.h"
60 #include "IDBKey.h" 60 #include "IDBKey.h"
61 #include "IDBKeyPath.h" 61 #include "IDBKeyPath.h"
62 #include "IDBMetadata.h" 62 #include "IDBMetadata.h"
63 #include "IconURL.h" 63 #include "IconURL.h"
64 #include "MediaPlayer.h" 64 #include "MediaPlayer.h"
65 #if ENABLE(MEDIA_SOURCE)
66 #include "MediaSourcePrivate.h" 65 #include "MediaSourcePrivate.h"
67 #endif
68 #include "MediaStreamSource.h" 66 #include "MediaStreamSource.h"
69 #include "NotificationClient.h" 67 #include "NotificationClient.h"
70 #include "PageVisibilityState.h" 68 #include "PageVisibilityState.h"
71 #include "RTCDataChannelHandlerClient.h" 69 #include "RTCDataChannelHandlerClient.h"
72 #include "RTCPeerConnectionHandlerClient.h" 70 #include "RTCPeerConnectionHandlerClient.h"
73 #include "ReferrerPolicy.h" 71 #include "ReferrerPolicy.h"
74 #include "ResourceLoadPriority.h" 72 #include "ResourceLoadPriority.h"
75 #include "ResourceResponse.h" 73 #include "ResourceResponse.h"
76 #include "Settings.h" 74 #include "Settings.h"
77 #include "SpeechRecognitionError.h" 75 #include "SpeechRecognitionError.h"
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 402
405 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeUnknown, MediaPlayer:: Unknown); 403 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeUnknown, MediaPlayer:: Unknown);
406 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeDownload, MediaPlayer: :Download); 404 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeDownload, MediaPlayer: :Download);
407 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeStoredStream, MediaPla yer::StoredStream); 405 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeStoredStream, MediaPla yer::StoredStream);
408 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeLiveStream, MediaPlaye r::LiveStream); 406 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeLiveStream, MediaPlaye r::LiveStream);
409 407
410 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None); 408 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None);
411 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaD ata); 409 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaD ata);
412 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto); 410 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto);
413 411
414 #if ENABLE(MEDIA_SOURCE)
415 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusOk, MediaSourcePriva te::Ok); 412 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusOk, MediaSourcePriva te::Ok);
416 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusNotSupported, MediaS ourcePrivate::NotSupported); 413 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusNotSupported, MediaS ourcePrivate::NotSupported);
417 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusReachedIdLimit, Medi aSourcePrivate::ReachedIdLimit); 414 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::AddStatusReachedIdLimit, Medi aSourcePrivate::ReachedIdLimit);
418 415
419 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNoError, Med iaSourcePrivate::EosNoError); 416 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNoError, Med iaSourcePrivate::EosNoError);
420 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNetworkError , MediaSourcePrivate::EosNetworkError); 417 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusNetworkError , MediaSourcePrivate::EosNetworkError);
421 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusDecodeError, MediaSourcePrivate::EosDecodeError); 418 COMPILE_ASSERT_MATCHING_ENUM(WebMediaSourceClient::EndOfStreamStatusDecodeError, MediaSourcePrivate::EosDecodeError);
422 #endif
423 419
424 #if ENABLE(ENCRYPTED_MEDIA) 420 #if ENABLE(ENCRYPTED_MEDIA)
425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionNoError, MediaPlay er::NoError); 421 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionNoError, MediaPlay er::NoError);
426 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionInvalidPlayerState , MediaPlayer::InvalidPlayerState); 422 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionInvalidPlayerState , MediaPlayer::InvalidPlayerState);
427 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionKeySystemNotSuppor ted, MediaPlayer::KeySystemNotSupported); 423 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionKeySystemNotSuppor ted, MediaPlayer::KeySystemNotSupported);
428 424
429 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeUnknown, Med iaPlayerClient::UnknownError); 425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeUnknown, Med iaPlayerClient::UnknownError);
430 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeClient, Medi aPlayerClient::ClientError); 426 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeClient, Medi aPlayerClient::ClientError);
431 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeService, Med iaPlayerClient::ServiceError); 427 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeService, Med iaPlayerClient::ServiceError);
432 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeOutput, Medi aPlayerClient::OutputError); 428 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeOutput, Medi aPlayerClient::OutputError);
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryLow, ResourceLoadPriorit yVeryLow); 628 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryLow, ResourceLoadPriorit yVeryLow);
633 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityLow, ResourceLoadPriorityLow ); 629 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityLow, ResourceLoadPriorityLow );
634 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityMedium, ResourceLoadPriority Medium); 630 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityMedium, ResourceLoadPriority Medium);
635 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityHigh, ResourceLoadPriorityHi gh); 631 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityHigh, ResourceLoadPriorityHi gh);
636 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryHigh, ResourceLoadPriori tyVeryHigh); 632 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryHigh, ResourceLoadPriori tyVeryHigh);
637 633
638 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel); 634 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel);
639 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); 635 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel);
640 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve l); 636 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLeve l);
641 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); 637 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel);
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/features.gypi ('k') | Source/WebKit/chromium/src/MediaSourcePrivateImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698