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

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

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 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 unified diff | Download patch
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 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 return; 565 return;
566 type = WebInputEvent::MouseWheel; 566 type = WebInputEvent::MouseWheel;
567 updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this); 567 updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
568 deltaX = -event.deltaX(); 568 deltaX = -event.deltaX();
569 deltaY = -event.deltaY(); 569 deltaY = -event.deltaY();
570 wheelTicksX = event.ticksX(); 570 wheelTicksX = event.ticksX();
571 wheelTicksY = event.ticksY(); 571 wheelTicksY = event.ticksY();
572 scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE; 572 scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE;
573 canScroll = event.canScroll(); 573 canScroll = event.canScroll();
574 resendingPluginId = event.resendingPluginId(); 574 resendingPluginId = event.resendingPluginId();
575 railsMode = static_cast<RailsMode>(event.railsMode()); 575 railsMode = static_cast<RailsMode>(event.getRailsMode());
576 hasPreciseScrollingDeltas = event.hasPreciseScrollingDeltas(); 576 hasPreciseScrollingDeltas = event.hasPreciseScrollingDeltas();
577 } 577 }
578 578
579 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event) 579 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event)
580 { 580 {
581 if (event.type() == EventTypeNames::keydown) 581 if (event.type() == EventTypeNames::keydown)
582 type = KeyDown; 582 type = KeyDown;
583 else if (event.type() == EventTypeNames::keyup) 583 else if (event.type() == EventTypeNames::keyup)
584 type = WebInputEvent::KeyUp; 584 type = WebInputEvent::KeyUp;
585 else if (event.type() == EventTypeNames::keypress) 585 else if (event.type() == EventTypeNames::keypress)
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 break; 740 break;
741 case GestureSourceTouchscreen: 741 case GestureSourceTouchscreen:
742 sourceDevice = WebGestureDeviceTouchscreen; 742 sourceDevice = WebGestureDeviceTouchscreen;
743 break; 743 break;
744 case GestureSourceUninitialized: 744 case GestureSourceUninitialized:
745 ASSERT_NOT_REACHED(); 745 ASSERT_NOT_REACHED();
746 } 746 }
747 } 747 }
748 748
749 } // namespace blink 749 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698