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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1422513006: Simplify TouchAction enum to be a simple bit flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix computed style / layout tests and CR feedback Created 5 years, 1 month 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 | « third_party/WebKit/Source/core/style/ComputedStyleConstants.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel); 665 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel);
666 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLevel ); 666 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLevel );
667 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel); 667 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel);
668 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel); 668 STATIC_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelInfo, InfoMessageLevel);
669 669
670 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersNew, NavigatorContentUtilsClient::C ustomHandlersNew); 670 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersNew, NavigatorContentUtilsClient::C ustomHandlersNew);
671 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsCl ient::CustomHandlersRegistered); 671 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsCl ient::CustomHandlersRegistered);
672 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsClie nt::CustomHandlersDeclined); 672 STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsClie nt::CustomHandlersDeclined);
673 673
674 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone); 674 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone);
675 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
676 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanLeft, TouchActionPanLeft); 675 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanLeft, TouchActionPanLeft);
677 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanRight, TouchActionPanRight); 676 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanRight, TouchActionPanRight);
678 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX); 677 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX);
679 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanUp, TouchActionPanUp); 678 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanUp, TouchActionPanUp);
680 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanDown, TouchActionPanDown); 679 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanDown, TouchActionPanDown);
681 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY); 680 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY);
681 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPan, TouchActionPan);
682 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom); 682 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom);
683 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionManipulation, TouchActionManipulation) ;
684 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionDoubleTapZoom, TouchActionDoubleTapZoo m);
685 STATIC_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
683 686
684 STATIC_ASSERT_MATCHING_ENUM(WebSelection::NoSelection, NoSelection); 687 STATIC_ASSERT_MATCHING_ENUM(WebSelection::NoSelection, NoSelection);
685 STATIC_ASSERT_MATCHING_ENUM(WebSelection::CaretSelection, CaretSelection); 688 STATIC_ASSERT_MATCHING_ENUM(WebSelection::CaretSelection, CaretSelection);
686 STATIC_ASSERT_MATCHING_ENUM(WebSelection::RangeSelection, RangeSelection); 689 STATIC_ASSERT_MATCHING_ENUM(WebSelection::RangeSelection, RangeSelection);
687 690
688 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyAllowed, ImageAnima tionPolicyAllowed); 691 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyAllowed, ImageAnima tionPolicyAllowed);
689 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyAnimateOnce, ImageA nimationPolicyAnimateOnce); 692 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyAnimateOnce, ImageA nimationPolicyAnimateOnce);
690 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyNoAnimation, ImageA nimationPolicyNoAnimation); 693 STATIC_ASSERT_MATCHING_ENUM(WebSettings::ImageAnimationPolicyNoAnimation, ImageA nimationPolicyNoAnimation);
691 694
692 STATIC_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsDefault, V8CacheOptionsDe fault); 695 STATIC_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsDefault, V8CacheOptionsDe fault);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem); 736 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeR eplaceCurrentItem);
734 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame); 737 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadType InitialInChildFrame);
735 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad); 738 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeI nitialHistoryLoad);
736 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin); 739 STATIC_ASSERT_MATCHING_ENUM(WebFrameLoadType::ReloadFromOrigin, FrameLoadTypeRel oadFromOrigin);
737 740
738 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove); 741 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType: :Remove);
739 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap); 742 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::S wap);
740 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove); 743 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::Detac hType::Remove);
741 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap); 744 STATIC_ASSERT_MATCHING_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachT ype::Swap);
742 } // namespace blink 745 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyleConstants.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698