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

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

Issue 814673002: replace COMPILE_ASSERT with static_assert in web/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase on master Created 6 years 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/web/AssociatedURLLoader.cpp ('k') | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 struct SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent { 57 struct SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent {
58 int gestureData[10]; 58 int gestureData[10];
59 }; 59 };
60 60
61 struct SameSizeAsWebTouchEvent : public SameSizeAsWebInputEvent { 61 struct SameSizeAsWebTouchEvent : public SameSizeAsWebInputEvent {
62 WebTouchPoint touchPoints[WebTouchEvent::touchesLengthCap]; 62 WebTouchPoint touchPoints[WebTouchEvent::touchesLengthCap];
63 int touchData[2]; 63 int touchData[2];
64 }; 64 };
65 65
66 COMPILE_ASSERT(sizeof(WebInputEvent) == sizeof(SameSizeAsWebInputEvent), WebInpu tEvent_has_gaps); 66 static_assert(sizeof(WebInputEvent) == sizeof(SameSizeAsWebInputEvent), "WebInpu tEvent should not have gaps");
67 COMPILE_ASSERT(sizeof(WebKeyboardEvent) == sizeof(SameSizeAsWebKeyboardEvent), W ebKeyboardEvent_has_gaps); 67 static_assert(sizeof(WebKeyboardEvent) == sizeof(SameSizeAsWebKeyboardEvent), "W ebKeyboardEvent should not have gaps");
68 COMPILE_ASSERT(sizeof(WebMouseEvent) == sizeof(SameSizeAsWebMouseEvent), WebMous eEvent_has_gaps); 68 static_assert(sizeof(WebMouseEvent) == sizeof(SameSizeAsWebMouseEvent), "WebMous eEvent should not have gaps");
69 COMPILE_ASSERT(sizeof(WebMouseWheelEvent) == sizeof(SameSizeAsWebMouseWheelEvent ), WebMouseWheelEvent_has_gaps); 69 static_assert(sizeof(WebMouseWheelEvent) == sizeof(SameSizeAsWebMouseWheelEvent) , "WebMouseWheelEvent should not have gaps");
70 COMPILE_ASSERT(sizeof(WebGestureEvent) == sizeof(SameSizeAsWebGestureEvent), Web GestureEvent_has_gaps); 70 static_assert(sizeof(WebGestureEvent) == sizeof(SameSizeAsWebGestureEvent), "Web GestureEvent should not have gaps");
71 COMPILE_ASSERT(sizeof(WebTouchEvent) == sizeof(SameSizeAsWebTouchEvent), WebTouc hEvent_has_gaps); 71 static_assert(sizeof(WebTouchEvent) == sizeof(SameSizeAsWebTouchEvent), "WebTouc hEvent should not have gaps");
72 72
73 static const char* staticKeyIdentifiers(unsigned short keyCode) 73 static const char* staticKeyIdentifiers(unsigned short keyCode)
74 { 74 {
75 switch (keyCode) { 75 switch (keyCode) {
76 case VKEY_MENU: 76 case VKEY_MENU:
77 return "Alt"; 77 return "Alt";
78 case VKEY_CONTROL: 78 case VKEY_CONTROL:
79 return "Control"; 79 return "Control";
80 case VKEY_SHIFT: 80 case VKEY_SHIFT:
81 return "Shift"; 81 return "Shift";
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 case VK_RSHIFT: 229 case VK_RSHIFT:
230 case VK_RMENU: 230 case VK_RMENU:
231 case VK_RWIN: 231 case VK_RWIN:
232 return IsRight; 232 return IsRight;
233 default: 233 default:
234 return 0; 234 return 0;
235 } 235 }
236 } 236 }
237 237
238 } // namespace blink 238 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/AssociatedURLLoader.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698