| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| index 42bae0b72a85e2141f46a13709ba8223a6526927..ac22ac5ab04f247e1d77926b9acabb6a835c8cac 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| @@ -75,7 +75,6 @@
|
| #include "core/page/scrolling/ScrollingCoordinator.h"
|
| #include "core/page/scrolling/TopDocumentRootScrollerController.h"
|
| #include "core/paint/PaintLayerFragment.h"
|
| -#include "platform/PlatformGestureEvent.h"
|
| #include "platform/PlatformMouseEvent.h"
|
| #include "platform/graphics/CompositorMutableProperties.h"
|
| #include "platform/graphics/GraphicsLayer.h"
|
| @@ -1522,7 +1521,7 @@ IntSize PaintLayerScrollableArea::offsetFromResizeCorner(
|
| return localPoint - resizerPoint;
|
| }
|
|
|
| -void PaintLayerScrollableArea::resize(const PlatformEvent& evt,
|
| +void PaintLayerScrollableArea::resize(const IntPoint& pos,
|
| const LayoutSize& oldOffset) {
|
| // FIXME: This should be possible on generated content but is not right now.
|
| if (!inResizeMode() || !box().canResize() || !box().node())
|
| @@ -1533,25 +1532,6 @@ void PaintLayerScrollableArea::resize(const PlatformEvent& evt,
|
|
|
| Document& document = element->document();
|
|
|
| - IntPoint pos;
|
| - const PlatformGestureEvent* gevt = 0;
|
| -
|
| - switch (evt.type()) {
|
| - case PlatformEvent::MouseMoved:
|
| - if (!document.frame()->eventHandler().mousePressed())
|
| - return;
|
| - pos = static_cast<const PlatformMouseEvent*>(&evt)->position();
|
| - break;
|
| - case PlatformEvent::GestureScrollUpdate:
|
| - pos = static_cast<const PlatformGestureEvent*>(&evt)->position();
|
| - gevt = static_cast<const PlatformGestureEvent*>(&evt);
|
| - pos = gevt->position();
|
| - pos.move(gevt->deltaX(), gevt->deltaY());
|
| - break;
|
| - default:
|
| - ASSERT_NOT_REACHED();
|
| - }
|
| -
|
| float zoomFactor = box().style()->effectiveZoom();
|
|
|
| IntSize newOffset =
|
|
|