| OLD | NEW |
| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "../platform/WebSize.h" | 33 #include "../platform/WebSize.h" |
| 34 #include "WebInputEvent.h" | 34 #include "WebInputEvent.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 struct WebActiveWheelFlingParameters { | 38 struct WebActiveWheelFlingParameters { |
| 39 WebFloatPoint delta; | 39 WebFloatPoint delta; |
| 40 WebPoint point; | 40 WebPoint point; |
| 41 WebPoint globalPoint; | 41 WebPoint globalPoint; |
| 42 int modifiers; | 42 int modifiers; |
| 43 // TODO(rjkroege): Restore typing once chromium side lands | 43 WebGestureDevice sourceDevice; |
| 44 // (http://crbug.com/343327) | |
| 45 int sourceDevice; | |
| 46 WebSize cumulativeScroll; | 44 WebSize cumulativeScroll; |
| 47 double startTime; | 45 double startTime; |
| 48 | 46 |
| 49 WebActiveWheelFlingParameters() | 47 WebActiveWheelFlingParameters() |
| 50 : modifiers(0) | 48 : modifiers(0) |
| 51 , sourceDevice(WebGestureDeviceTouchpad) | 49 , sourceDevice(WebGestureDeviceTouchpad) |
| 52 , startTime(0) | 50 , startTime(0) |
| 53 { | 51 { |
| 54 } | 52 } |
| 55 }; | 53 }; |
| 56 | 54 |
| 57 } | 55 } |
| 58 | 56 |
| 59 #endif | 57 #endif |
| OLD | NEW |