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

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

Issue 318923004: Eliminate MediaPlayer & MediaPlayerClient abstractions(readystate) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed review comments Created 6 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
« no previous file with comments | « Source/platform/graphics/media/MediaPlayer.h ('k') | Source/web/WebMediaPlayerClientImpl.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 27 matching lines...) Expand all
38 #include "core/accessibility/AXObjectCache.h" 38 #include "core/accessibility/AXObjectCache.h"
39 #include "core/dom/DocumentMarker.h" 39 #include "core/dom/DocumentMarker.h"
40 #include "core/dom/ExceptionCode.h" 40 #include "core/dom/ExceptionCode.h"
41 #include "core/dom/IconURL.h" 41 #include "core/dom/IconURL.h"
42 #include "core/editing/TextAffinity.h" 42 #include "core/editing/TextAffinity.h"
43 #include "core/fileapi/FileError.h" 43 #include "core/fileapi/FileError.h"
44 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
45 #include "core/frame/csp/ContentSecurityPolicy.h" 45 #include "core/frame/csp/ContentSecurityPolicy.h"
46 #include "core/html/HTMLFormElement.h" 46 #include "core/html/HTMLFormElement.h"
47 #include "core/html/HTMLInputElement.h" 47 #include "core/html/HTMLInputElement.h"
48 #include "core/html/HTMLMediaElement.h"
48 #include "core/html/shadow/TextControlInnerElements.h" 49 #include "core/html/shadow/TextControlInnerElements.h"
49 #include "core/loader/FrameLoaderTypes.h" 50 #include "core/loader/FrameLoaderTypes.h"
50 #include "core/loader/NavigationPolicy.h" 51 #include "core/loader/NavigationPolicy.h"
51 #include "core/loader/appcache/ApplicationCacheHost.h" 52 #include "core/loader/appcache/ApplicationCacheHost.h"
52 #include "core/page/InjectedStyleSheets.h" 53 #include "core/page/InjectedStyleSheets.h"
53 #include "core/page/PageVisibilityState.h" 54 #include "core/page/PageVisibilityState.h"
54 #include "core/rendering/style/RenderStyleConstants.h" 55 #include "core/rendering/style/RenderStyleConstants.h"
55 #include "modules/geolocation/GeolocationError.h" 56 #include "modules/geolocation/GeolocationError.h"
56 #include "modules/geolocation/GeolocationPosition.h" 57 #include "modules/geolocation/GeolocationPosition.h"
57 #include "modules/indexeddb/IDBKey.h" 58 #include "modules/indexeddb/IDBKey.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 COMPILE_ASSERT_MATCHING_ENUM(WebNode::DocumentFragmentNode, Node::DOCUMENT_FRAGM ENT_NODE); 409 COMPILE_ASSERT_MATCHING_ENUM(WebNode::DocumentFragmentNode, Node::DOCUMENT_FRAGM ENT_NODE);
409 410
410 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateEmpty, MediaPlayer::Emp ty); 411 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateEmpty, MediaPlayer::Emp ty);
411 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateIdle, MediaPlayer::Idle ); 412 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateIdle, MediaPlayer::Idle );
412 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateLoading, MediaPlayer::L oading); 413 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateLoading, MediaPlayer::L oading);
413 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateLoaded, MediaPlayer::Lo aded); 414 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateLoaded, MediaPlayer::Lo aded);
414 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateFormatError, MediaPlaye r::FormatError); 415 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateFormatError, MediaPlaye r::FormatError);
415 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateNetworkError, MediaPlay er::NetworkError); 416 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateNetworkError, MediaPlay er::NetworkError);
416 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateDecodeError, MediaPlaye r::DecodeError); 417 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::NetworkStateDecodeError, MediaPlaye r::DecodeError);
417 418
418 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, MediaPlayer: :HaveNothing); 419 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaEle ment::HAVE_NOTHING);
419 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, MediaPlayer ::HaveMetadata); 420 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaEl ement::HAVE_METADATA);
420 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, MediaPla yer::HaveCurrentData); 421 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMedi aElement::HAVE_CURRENT_DATA);
421 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, MediaPlay er::HaveFutureData); 422 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMedia Element::HAVE_FUTURE_DATA);
422 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, MediaPlay er::HaveEnoughData); 423 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMedia Element::HAVE_ENOUGH_DATA);
423 424
424 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None); 425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None);
425 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaD ata); 426 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaD ata);
426 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto); 427 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto);
427 428
428 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonNone, NoButton); 429 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonNone, NoButton);
429 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonLeft, LeftButton); 430 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonLeft, LeftButton);
430 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonMiddle, MiddleButton); 431 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonMiddle, MiddleButton);
431 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonRight, RightButton); 432 COMPILE_ASSERT_MATCHING_ENUM(WebMouseEvent::ButtonRight, RightButton);
432 433
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC lient::CustomHandlersRegistered); 613 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsC lient::CustomHandlersRegistered);
613 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli ent::CustomHandlersDeclined); 614 COMPILE_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsCli ent::CustomHandlersDeclined);
614 615
615 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); 616 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone);
616 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto); 617 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
617 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); 618 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX);
618 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); 619 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY);
619 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom); 620 COMPILE_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom);
620 621
621 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa lue::wireFormatVersion); 622 COMPILE_ASSERT_MATCHING_UINT64(kSerializedScriptValueVersion, SerializedScriptVa lue::wireFormatVersion);
OLDNEW
« no previous file with comments | « Source/platform/graphics/media/MediaPlayer.h ('k') | Source/web/WebMediaPlayerClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698