| OLD | NEW |
| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 if (widget) { | 68 if (widget) { |
| 69 FrameView* rootView = toFrameView(widget->root()); | 69 FrameView* rootView = toFrameView(widget->root()); |
| 70 if (rootView) { | 70 if (rootView) { |
| 71 scale = rootView->inputEventsScaleFactor(); | 71 scale = rootView->inputEventsScaleFactor(); |
| 72 offset = FloatSize(rootView->inputEventsOffsetForEmulation()); | 72 offset = FloatSize(rootView->inputEventsOffsetForEmulation()); |
| 73 visualViewport = flooredIntPoint(rootView->page() | 73 visualViewport = flooredIntPoint(rootView->page() |
| 74 ->frameHost() | 74 ->frameHost() |
| 75 .visualViewport() | 75 .visualViewport() |
| 76 .visibleRect() | 76 .visibleRect() |
| 77 .location()); | 77 .location()); |
| 78 overscrollOffset = | 78 overscrollOffset = rootView->page()->chromeClient().elasticOverscroll(); |
| 79 rootView->page()->frameHost().chromeClient().elasticOverscroll(); | |
| 80 } | 79 } |
| 81 } | 80 } |
| 82 return FloatPoint( | 81 return FloatPoint( |
| 83 -offset.width() / scale + visualViewport.x() + overscrollOffset.width(), | 82 -offset.width() / scale + visualViewport.x() + overscrollOffset.width(), |
| 84 -offset.height() / scale + visualViewport.y() + | 83 -offset.height() / scale + visualViewport.y() + |
| 85 overscrollOffset.height()); | 84 overscrollOffset.height()); |
| 86 } | 85 } |
| 87 | 86 |
| 88 FloatPoint convertAbsoluteLocationForLayoutObjectFloat( | 87 FloatPoint convertAbsoluteLocationForLayoutObjectFloat( |
| 89 const DoublePoint& location, | 88 const DoublePoint& location, |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 Vector<WebTouchEvent> result; | 369 Vector<WebTouchEvent> result; |
| 371 for (const auto& event : coalescedEvents) { | 370 for (const auto& event : coalescedEvents) { |
| 372 DCHECK(WebInputEvent::isTouchEventType(event->type())); | 371 DCHECK(WebInputEvent::isTouchEventType(event->type())); |
| 373 result.push_back(TransformWebTouchEvent( | 372 result.push_back(TransformWebTouchEvent( |
| 374 scale, translation, static_cast<const WebTouchEvent&>(*event))); | 373 scale, translation, static_cast<const WebTouchEvent&>(*event))); |
| 375 } | 374 } |
| 376 return result; | 375 return result; |
| 377 } | 376 } |
| 378 | 377 |
| 379 } // namespace blink | 378 } // namespace blink |
| OLD | NEW |