| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } | 187 } |
| 188 } | 188 } |
| 189 | 189 |
| 190 #if OS(WIN) | 190 #if OS(WIN) |
| 191 void AutoscrollController::handleMouseReleaseForPanScrolling(LocalFrame* frame,
const PlatformMouseEvent& mouseEvent) | 191 void AutoscrollController::handleMouseReleaseForPanScrolling(LocalFrame* frame,
const PlatformMouseEvent& mouseEvent) |
| 192 { | 192 { |
| 193 if (!frame->isMainFrame()) | 193 if (!frame->isMainFrame()) |
| 194 return; | 194 return; |
| 195 switch (m_autoscrollType) { | 195 switch (m_autoscrollType) { |
| 196 case AutoscrollForPan: | 196 case AutoscrollForPan: |
| 197 if (mouseEvent.button() == MiddleButton) | 197 if (mouseEvent.pointerProperties().button == WebPointerProperties::Butto
n::Middle) |
| 198 m_autoscrollType = AutoscrollForPanCanStop; | 198 m_autoscrollType = AutoscrollForPanCanStop; |
| 199 break; | 199 break; |
| 200 case AutoscrollForPanCanStop: | 200 case AutoscrollForPanCanStop: |
| 201 stopAutoscroll(); | 201 stopAutoscroll(); |
| 202 break; | 202 break; |
| 203 case AutoscrollForDragAndDrop: | 203 case AutoscrollForDragAndDrop: |
| 204 case AutoscrollForSelection: | 204 case AutoscrollForSelection: |
| 205 case NoAutoscroll: | 205 case NoAutoscroll: |
| 206 // Nothing to do. | 206 // Nothing to do. |
| 207 break; | 207 break; |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 view->setCursor(eastPanningCursor()); | 310 view->setCursor(eastPanningCursor()); |
| 311 } else if (west) { | 311 } else if (west) { |
| 312 view->setCursor(westPanningCursor()); | 312 view->setCursor(westPanningCursor()); |
| 313 } else { | 313 } else { |
| 314 view->setCursor(middlePanningCursor()); | 314 view->setCursor(middlePanningCursor()); |
| 315 } | 315 } |
| 316 } | 316 } |
| 317 #endif | 317 #endif |
| 318 | 318 |
| 319 } // namespace blink | 319 } // namespace blink |
| OLD | NEW |