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

Side by Side Diff: Source/web/AssertMatchingEnums.cpp

Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: address comments Created 5 years, 5 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/platform/graphics/media/MediaPlayer.cpp ('k') | Source/web/FrameLoaderClientImpl.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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "modules/navigatorcontentutils/NavigatorContentUtilsClient.h" 65 #include "modules/navigatorcontentutils/NavigatorContentUtilsClient.h"
66 #include "modules/quota/DeprecatedStorageQuota.h" 66 #include "modules/quota/DeprecatedStorageQuota.h"
67 #include "modules/speech/SpeechRecognitionError.h" 67 #include "modules/speech/SpeechRecognitionError.h"
68 #include "platform/Cursor.h" 68 #include "platform/Cursor.h"
69 #include "platform/FileMetadata.h" 69 #include "platform/FileMetadata.h"
70 #include "platform/FileSystemType.h" 70 #include "platform/FileSystemType.h"
71 #include "platform/PlatformMouseEvent.h" 71 #include "platform/PlatformMouseEvent.h"
72 #include "platform/fonts/FontDescription.h" 72 #include "platform/fonts/FontDescription.h"
73 #include "platform/fonts/FontSmoothingMode.h" 73 #include "platform/fonts/FontSmoothingMode.h"
74 #include "platform/graphics/filters/FilterOperation.h" 74 #include "platform/graphics/filters/FilterOperation.h"
75 #include "platform/graphics/media/MediaPlayer.h"
76 #include "platform/mediastream/MediaStreamSource.h" 75 #include "platform/mediastream/MediaStreamSource.h"
77 #include "platform/network/ContentSecurityPolicyParsers.h" 76 #include "platform/network/ContentSecurityPolicyParsers.h"
78 #include "platform/network/ResourceLoadPriority.h" 77 #include "platform/network/ResourceLoadPriority.h"
79 #include "platform/network/ResourceResponse.h" 78 #include "platform/network/ResourceResponse.h"
80 #include "platform/scroll/ScrollTypes.h" 79 #include "platform/scroll/ScrollTypes.h"
81 #include "platform/text/TextChecking.h" 80 #include "platform/text/TextChecking.h"
82 #include "platform/text/TextDecoration.h" 81 #include "platform/text/TextDecoration.h"
83 #include "platform/weborigin/ReferrerPolicy.h" 82 #include "platform/weborigin/ReferrerPolicy.h"
84 #include "platform/weborigin/SchemeRegistry.h" 83 #include "platform/weborigin/SchemeRegistry.h"
85 #include "public/platform/WebApplicationCacheHost.h" 84 #include "public/platform/WebApplicationCacheHost.h"
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentNode, Node::DOCUMENT_NODE); 462 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentNode, Node::DOCUMENT_NODE);
464 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentTypeNode, Node::DOCUMENT_TYPE_NODE) ; 463 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentTypeNode, Node::DOCUMENT_TYPE_NODE) ;
465 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentFragmentNode, Node::DOCUMENT_FRAGME NT_NODE); 464 STATIC_ASSERT_MATCHING_ENUM(WebNode::DocumentFragmentNode, Node::DOCUMENT_FRAGME NT_NODE);
466 465
467 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElem ent::HAVE_NOTHING); 466 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElem ent::HAVE_NOTHING);
468 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaEle ment::HAVE_METADATA); 467 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaEle ment::HAVE_METADATA);
469 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMedia Element::HAVE_CURRENT_DATA); 468 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMedia Element::HAVE_CURRENT_DATA);
470 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaE lement::HAVE_FUTURE_DATA); 469 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaE lement::HAVE_FUTURE_DATA);
471 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaE lement::HAVE_ENOUGH_DATA); 470 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaE lement::HAVE_ENOUGH_DATA);
472 471
473 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None);
474 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaDa ta);
475 STATIC_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto);
476
477 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonNone, NoButton); 472 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonNone, NoButton);
478 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonLeft, LeftButton); 473 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonLeft, LeftButton);
479 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonMiddle, MiddleButton); 474 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonMiddle, MiddleButton);
480 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonRight, RightButton); 475 STATIC_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonRight, RightButton);
481 476
482 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar); 477 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar);
483 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::Vertical, VerticalScrollbar); 478 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::Vertical, VerticalScrollbar);
484 479
485 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByLine, ScrollByLine); 480 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByLine, ScrollByLine);
486 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByPage, ScrollByPage); 481 STATIC_ASSERT_MATCHING_ENUM(WebScrollbar::ScrollByPage, ScrollByPage);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem); 715 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem);
721 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame); 716 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame);
722 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad); 717 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad);
723 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin); 718 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin);
724 719
725 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove); 720 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove);
726 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap); 721 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap);
727 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove); 722 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove);
728 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap); 723 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap);
729 } // namespace blink 724 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/graphics/media/MediaPlayer.cpp ('k') | Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698