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

Unified Diff: third_party/WebKit/Source/web/WebInputEvent.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebInputEvent.cpp
diff --git a/third_party/WebKit/Source/web/WebInputEvent.cpp b/third_party/WebKit/Source/web/WebInputEvent.cpp
index d43b11be35d06d8ed705637db5edded0e0234349..9918c3d2d11d205436fcc8672c106fcf61ac1686 100644
--- a/third_party/WebKit/Source/web/WebInputEvent.cpp
+++ b/third_party/WebKit/Source/web/WebInputEvent.cpp
@@ -82,11 +82,13 @@ static_assert(sizeof(WebTouchEvent) == sizeof(SameSizeAsWebTouchEvent),
"WebTouchEvent should not have gaps");
#define CASE_TYPE(t) \
- case WebInputEvent::t: \
+ case WebInputEvent::k##t: \
return #t
// static
const char* WebInputEvent::GetName(WebInputEvent::Type type) {
switch (type) {
+ /* DO NOT SUBMIT - Conflict resolution helper:
+ * important to use Undefined, rather than kUndefined below. */
CASE_TYPE(Undefined);
CASE_TYPE(MouseDown);
CASE_TYPE(MouseUp);
@@ -121,6 +123,8 @@ const char* WebInputEvent::GetName(WebInputEvent::Type type) {
CASE_TYPE(TouchEnd);
CASE_TYPE(TouchCancel);
CASE_TYPE(TouchScrollStarted);
+ /* DO NOT SUBMIT - Conflict resolution helper:
+ * important to use TouchScrollStarted, rather than kTouchSc... above. */
default:
NOTREACHED();
return "";
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp ('k') | third_party/WebKit/Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698