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

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

Issue 2586133003: Remove PlatformWheelEvent and use WebMouseWheelEvent instead (Closed)
Patch Set: Address comments Created 3 years, 11 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 HTMLMediaElement::kHaveNothing); 567 HTMLMediaElement::kHaveNothing);
568 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveMetadata, 568 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveMetadata,
569 HTMLMediaElement::kHaveMetadata); 569 HTMLMediaElement::kHaveMetadata);
570 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData, 570 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveCurrentData,
571 HTMLMediaElement::kHaveCurrentData); 571 HTMLMediaElement::kHaveCurrentData);
572 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveFutureData, 572 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveFutureData,
573 HTMLMediaElement::kHaveFutureData); 573 HTMLMediaElement::kHaveFutureData);
574 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData, 574 STATIC_ASSERT_ENUM(WebMediaPlayer::ReadyStateHaveEnoughData,
575 HTMLMediaElement::kHaveEnoughData); 575 HTMLMediaElement::kHaveEnoughData);
576 576
577 #if OS(MACOSX)
578 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, PlatformWheelEventPhaseNone);
579 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseBegan,
580 PlatformWheelEventPhaseBegan);
581 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseStationary,
582 PlatformWheelEventPhaseStationary);
583 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseChanged,
584 PlatformWheelEventPhaseChanged);
585 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseEnded,
586 PlatformWheelEventPhaseEnded);
587 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseCancelled,
588 PlatformWheelEventPhaseCancelled);
589 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseMayBegin,
590 PlatformWheelEventPhaseMayBegin);
591
592 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseNone, WheelEventPhaseNone);
593 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseBegan, WheelEventPhaseBegan);
594 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseStationary,
595 WheelEventPhaseStationary);
596 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseChanged, WheelEventPhaseChanged);
597 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseEnded, WheelEventPhaseEnded);
598 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseCancelled,
599 WheelEventPhaseCancelled);
600 STATIC_ASSERT_ENUM(WebMouseWheelEvent::PhaseMayBegin, WheelEventPhaseMayBegin);
601 #endif
602
603 STATIC_ASSERT_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar); 577 STATIC_ASSERT_ENUM(WebScrollbar::Horizontal, HorizontalScrollbar);
604 STATIC_ASSERT_ENUM(WebScrollbar::Vertical, VerticalScrollbar); 578 STATIC_ASSERT_ENUM(WebScrollbar::Vertical, VerticalScrollbar);
605 579
606 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByLine, ScrollByLine); 580 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByLine, ScrollByLine);
607 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByPage, ScrollByPage); 581 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByPage, ScrollByPage);
608 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByDocument, ScrollByDocument); 582 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByDocument, ScrollByDocument);
609 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByPixel, ScrollByPixel); 583 STATIC_ASSERT_ENUM(WebScrollbar::ScrollByPixel, ScrollByPixel);
610 584
611 STATIC_ASSERT_ENUM(WebScrollbar::RegularScrollbar, RegularScrollbar); 585 STATIC_ASSERT_ENUM(WebScrollbar::RegularScrollbar, RegularScrollbar);
612 STATIC_ASSERT_ENUM(WebScrollbar::SmallScrollbar, SmallScrollbar); 586 STATIC_ASSERT_ENUM(WebScrollbar::SmallScrollbar, SmallScrollbar);
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 ProgressBarCompletion::DOMContentLoaded); 883 ProgressBarCompletion::DOMContentLoaded);
910 STATIC_ASSERT_ENUM( 884 STATIC_ASSERT_ENUM(
911 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames, 885 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames,
912 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); 886 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
913 887
914 static_assert(kSerializedScriptValueVersion == 888 static_assert(kSerializedScriptValueVersion ==
915 SerializedScriptValue::wireFormatVersion, 889 SerializedScriptValue::wireFormatVersion,
916 ""); 890 "");
917 891
918 } // namespace blink 892 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698