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

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

Issue 2245063006: Revert of Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix patch apply Created 4 years, 4 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
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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 STATIC_ASSERT_ENUM(WebInputEvent::CapsLockOn, PlatformEvent::CapsLockOn); 497 STATIC_ASSERT_ENUM(WebInputEvent::CapsLockOn, PlatformEvent::CapsLockOn);
498 STATIC_ASSERT_ENUM(WebInputEvent::NumLockOn, PlatformEvent::NumLockOn); 498 STATIC_ASSERT_ENUM(WebInputEvent::NumLockOn, PlatformEvent::NumLockOn);
499 STATIC_ASSERT_ENUM(WebInputEvent::ScrollLockOn, PlatformEvent::ScrollLockOn); 499 STATIC_ASSERT_ENUM(WebInputEvent::ScrollLockOn, PlatformEvent::ScrollLockOn);
500 500
501 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElement::kHav eNothing); 501 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveNothing, HTMLMediaElement::kHav eNothing);
502 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaElement::kHa veMetadata); 502 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, HTMLMediaElement::kHa veMetadata);
503 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMediaElement:: kHaveCurrentData); 503 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, HTMLMediaElement:: kHaveCurrentData);
504 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaElement::k HaveFutureData); 504 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, HTMLMediaElement::k HaveFutureData);
505 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaElement::k HaveEnoughData); 505 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, HTMLMediaElement::k HaveEnoughData);
506 506
507 STATIC_ASSERT_ENUM(WebMouseEvent::ButtonNone, NoButton);
508 STATIC_ASSERT_ENUM(WebMouseEvent::ButtonLeft, LeftButton);
509 STATIC_ASSERT_ENUM(WebMouseEvent::ButtonMiddle, MiddleButton);
510 STATIC_ASSERT_ENUM(WebMouseEvent::ButtonRight, RightButton);
511
507 #if OS(MACOSX) 512 #if OS(MACOSX)
508 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, PlatformWheelEventPhaseNone); 513 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, PlatformWheelEventPhaseNone);
509 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseBegan, PlatformWheelEventPhaseBegan) ; 514 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseBegan, PlatformWheelEventPhaseBegan) ;
510 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseStationary, PlatformWheelEventPhaseS tationary); 515 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseStationary, PlatformWheelEventPhaseS tationary);
511 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseChanged, PlatformWheelEventPhaseChan ged); 516 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseChanged, PlatformWheelEventPhaseChan ged);
512 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseEnded, PlatformWheelEventPhaseEnded) ; 517 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseEnded, PlatformWheelEventPhaseEnded) ;
513 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseCancelled, PlatformWheelEventPhaseCa ncelled); 518 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseCancelled, PlatformWheelEventPhaseCa ncelled);
514 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseMayBegin, PlatformWheelEventPhaseMay Begin); 519 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseMayBegin, PlatformWheelEventPhaseMay Begin);
515 520
516 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, WheelEventPhaseNone); 521 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, WheelEventPhaseNone);
(...skipping 23 matching lines...) Expand all
540 STATIC_ASSERT_ENUM(WebScrollbar::ForwardTrackPart, ForwardTrackPart); 545 STATIC_ASSERT_ENUM(WebScrollbar::ForwardTrackPart, ForwardTrackPart);
541 STATIC_ASSERT_ENUM(WebScrollbar::BackButtonEndPart, BackButtonEndPart); 546 STATIC_ASSERT_ENUM(WebScrollbar::BackButtonEndPart, BackButtonEndPart);
542 STATIC_ASSERT_ENUM(WebScrollbar::ForwardButtonEndPart, ForwardButtonEndPart); 547 STATIC_ASSERT_ENUM(WebScrollbar::ForwardButtonEndPart, ForwardButtonEndPart);
543 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarBGPart, ScrollbarBGPart); 548 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarBGPart, ScrollbarBGPart);
544 STATIC_ASSERT_ENUM(WebScrollbar::TrackBGPart, TrackBGPart); 549 STATIC_ASSERT_ENUM(WebScrollbar::TrackBGPart, TrackBGPart);
545 STATIC_ASSERT_ENUM(WebScrollbar::AllParts, AllParts); 550 STATIC_ASSERT_ENUM(WebScrollbar::AllParts, AllParts);
546 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleDefault, ScrollbarOverlayS tyleDefault); 551 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleDefault, ScrollbarOverlayS tyleDefault);
547 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleDark, ScrollbarOverlayStyl eDark); 552 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleDark, ScrollbarOverlayStyl eDark);
548 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleLight, ScrollbarOverlaySty leLight); 553 STATIC_ASSERT_ENUM(WebScrollbar::ScrollbarOverlayStyleLight, ScrollbarOverlaySty leLight);
549 554
555 STATIC_ASSERT_ENUM(WebScrollbarBehavior::ButtonNone, NoButton);
556 STATIC_ASSERT_ENUM(WebScrollbarBehavior::ButtonLeft, LeftButton);
557 STATIC_ASSERT_ENUM(WebScrollbarBehavior::ButtonMiddle, MiddleButton);
558 STATIC_ASSERT_ENUM(WebScrollbarBehavior::ButtonRight, RightButton);
559
550 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorMac, EditingMacBehavior); 560 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorMac, EditingMacBehavior);
551 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorWin, EditingWindowsBehavior); 561 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorWin, EditingWindowsBehavior);
552 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorUnix, EditingUnixBehavior); 562 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorUnix, EditingUnixBehavior);
553 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorAndroid, EditingAndroidBehavior); 563 STATIC_ASSERT_ENUM(WebSettings::EditingBehaviorAndroid, EditingAndroidBehavior);
554 564
555 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::False, PassiveListe nerDefault::False); 565 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::False, PassiveListe nerDefault::False);
556 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::True, PassiveListen erDefault::True); 566 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::True, PassiveListen erDefault::True);
557 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::ForceAllTrue, Passi veListenerDefault::ForceAllTrue); 567 STATIC_ASSERT_ENUM(WebSettings::PassiveEventListenerDefault::ForceAllTrue, Passi veListenerDefault::ForceAllTrue);
558 568
559 STATIC_ASSERT_ENUM(WebIDBDatabaseExceptionUnknownError, UnknownError); 569 STATIC_ASSERT_ENUM(WebIDBDatabaseExceptionUnknownError, UnknownError);
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap ); 769 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap );
760 770
761 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, ProgressBarCom pletion::LoadEvent); 771 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, ProgressBarCom pletion::LoadEvent);
762 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, Progr essBarCompletion::ResourcesBeforeDCL); 772 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, Progr essBarCompletion::ResourcesBeforeDCL);
763 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, Progres sBarCompletion::DOMContentLoaded); 773 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, Progres sBarCompletion::DOMContentLoaded);
764 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSame OriginIFrames, ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); 774 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSame OriginIFrames, ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
765 775
766 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, ""); 776 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, "");
767 777
768 } // namespace blink 778 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp ('k') | third_party/WebKit/Source/web/ChromeClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698