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

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

Issue 16387015: Make unprefixed EME APIs use platform and Chromium. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: KURL.h moved Created 7 years, 6 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 | Annotate | Revision Log
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "core/html/HTMLInputElement.h" 94 #include "core/html/HTMLInputElement.h"
95 #include "core/html/shadow/TextControlInnerElements.h" 95 #include "core/html/shadow/TextControlInnerElements.h"
96 #include "core/loader/appcache/ApplicationCacheHost.h" 96 #include "core/loader/appcache/ApplicationCacheHost.h"
97 #include "core/page/ContentSecurityPolicy.h" 97 #include "core/page/ContentSecurityPolicy.h"
98 #include "core/page/PageVisibilityState.h" 98 #include "core/page/PageVisibilityState.h"
99 #include "core/page/Settings.h" 99 #include "core/page/Settings.h"
100 #include "core/page/UserContentTypes.h" 100 #include "core/page/UserContentTypes.h"
101 #include "core/page/UserStyleSheetTypes.h" 101 #include "core/page/UserStyleSheetTypes.h"
102 #include "core/platform/Cursor.h" 102 #include "core/platform/Cursor.h"
103 #include "core/platform/FileMetadata.h" 103 #include "core/platform/FileMetadata.h"
104 #include "core/platform/graphics/ContentDecryptionModuleSession.h"
104 #include "core/platform/graphics/FontDescription.h" 105 #include "core/platform/graphics/FontDescription.h"
105 #include "core/platform/graphics/FontSmoothingMode.h" 106 #include "core/platform/graphics/FontSmoothingMode.h"
106 #include "core/platform/graphics/InbandTextTrackPrivate.h" 107 #include "core/platform/graphics/InbandTextTrackPrivate.h"
107 #include "core/platform/graphics/MediaPlayer.h" 108 #include "core/platform/graphics/MediaPlayer.h"
108 #include "core/platform/graphics/MediaSourcePrivate.h" 109 #include "core/platform/graphics/MediaSourcePrivate.h"
109 #include "core/platform/graphics/filters/FilterOperation.h" 110 #include "core/platform/graphics/filters/FilterOperation.h"
110 #include "core/platform/mediastream/MediaStreamSource.h" 111 #include "core/platform/mediastream/MediaStreamSource.h"
111 #include "core/platform/mediastream/RTCDataChannelHandlerClient.h" 112 #include "core/platform/mediastream/RTCDataChannelHandlerClient.h"
112 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" 113 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h"
113 #include "core/platform/network/ResourceLoadPriority.h" 114 #include "core/platform/network/ResourceLoadPriority.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionInvalidPlayerState , MediaPlayer::InvalidPlayerState); 425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionInvalidPlayerState , MediaPlayer::InvalidPlayerState);
425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionKeySystemNotSuppor ted, MediaPlayer::KeySystemNotSupported); 426 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MediaKeyExceptionKeySystemNotSuppor ted, MediaPlayer::KeySystemNotSupported);
426 427
427 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeUnknown, Med iaPlayerClient::UnknownError); 428 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeUnknown, Med iaPlayerClient::UnknownError);
428 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeClient, Medi aPlayerClient::ClientError); 429 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeClient, Medi aPlayerClient::ClientError);
429 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeService, Med iaPlayerClient::ServiceError); 430 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeService, Med iaPlayerClient::ServiceError);
430 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeOutput, Medi aPlayerClient::OutputError); 431 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeOutput, Medi aPlayerClient::OutputError);
431 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeHardwareChan ge, MediaPlayerClient::HardwareChangeError); 432 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeHardwareChan ge, MediaPlayerClient::HardwareChangeError);
432 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeDomain, Medi aPlayerClient::DomainError); 433 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayerClient::MediaKeyErrorCodeDomain, Medi aPlayerClient::DomainError);
433 434
435 COMPILE_ASSERT_MATCHING_ENUM(WebContentDecryptionModuleSession::Client::MediaKey ErrorCodeUnknown, ContentDecryptionModuleSessionClient::UnknownError);
436 COMPILE_ASSERT_MATCHING_ENUM(WebContentDecryptionModuleSession::Client::MediaKey ErrorCodeClient, ContentDecryptionModuleSessionClient::ClientError);
437
434 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) 438 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
435 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionAllowed, Notifi cationClient::PermissionAllowed); 439 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionAllowed, Notifi cationClient::PermissionAllowed);
436 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionNotAllowed, Not ificationClient::PermissionNotAllowed); 440 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionNotAllowed, Not ificationClient::PermissionNotAllowed);
437 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionDenied, Notific ationClient::PermissionDenied); 441 COMPILE_ASSERT_MATCHING_ENUM(WebNotificationPresenter::PermissionDenied, Notific ationClient::PermissionDenied);
438 #endif 442 #endif
439 443
440 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar); 444 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar);
441 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::Vertical, VerticalScrollbar); 445 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::Vertical, VerticalScrollbar);
442 446
443 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByLine, ScrollByLine); 447 COMPILE_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByLine, ScrollByLine);
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonPerspective, CompositingReasonPers pective); 651 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonPerspective, CompositingReasonPers pective);
648 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonPreserve3D, CompositingReasonPrese rve3D); 652 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonPreserve3D, CompositingReasonPrese rve3D);
649 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonReflectionOfCompositedParent, Comp ositingReasonReflectionOfCompositedParent); 653 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonReflectionOfCompositedParent, Comp ositingReasonReflectionOfCompositedParent);
650 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonRoot, CompositingReasonRoot); 654 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonRoot, CompositingReasonRoot);
651 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForClip, CompositingReasonLay erForClip); 655 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForClip, CompositingReasonLay erForClip);
652 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForScrollbar, CompositingReas onLayerForScrollbar); 656 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForScrollbar, CompositingReas onLayerForScrollbar);
653 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForScrollingContainer, Compos itingReasonLayerForScrollingContainer); 657 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForScrollingContainer, Compos itingReasonLayerForScrollingContainer);
654 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForForeground, CompositingRea sonLayerForForeground); 658 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForForeground, CompositingRea sonLayerForForeground);
655 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForBackground, CompositingRea sonLayerForBackground); 659 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForBackground, CompositingRea sonLayerForBackground);
656 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForMask, CompositingReasonLay erForMask); 660 COMPILE_ASSERT_MATCHING_ENUM(CompositingReasonLayerForMask, CompositingReasonLay erForMask);
OLDNEW
« no previous file with comments | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt ('k') | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698