Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 2335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2346 return widget && passGestureEventToWidget(gestureEvent, widget); | 2346 return widget && passGestureEventToWidget(gestureEvent, widget); |
| 2347 } | 2347 } |
| 2348 return false; | 2348 return false; |
| 2349 } | 2349 } |
| 2350 | 2350 |
| 2351 bool EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEve nt) { | 2351 bool EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEve nt) { |
| 2352 RefPtr<Node> node = m_scrollGestureHandlingNode; | 2352 RefPtr<Node> node = m_scrollGestureHandlingNode; |
| 2353 clearGestureScrollNodes(); | 2353 clearGestureScrollNodes(); |
| 2354 | 2354 |
| 2355 if (node) { | 2355 if (node) { |
| 2356 #if !ENABLE(OILPAN) | |
|
Erik Corry
2014/05/06 09:02:25
Maybe just remove this assert completely since it'
Mads Ager (chromium)
2014/05/06 09:16:51
Done.
| |
| 2356 ASSERT(node->refCount() > 0); | 2357 ASSERT(node->refCount() > 0); |
| 2358 #endif | |
| 2357 passGestureEventToWidgetIfPossible(gestureEvent, node->renderer()); | 2359 passGestureEventToWidgetIfPossible(gestureEvent, node->renderer()); |
| 2358 } | 2360 } |
| 2359 | 2361 |
| 2360 return false; | 2362 return false; |
| 2361 } | 2363 } |
| 2362 | 2364 |
| 2363 bool EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureE vent) | 2365 bool EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureE vent) |
| 2364 { | 2366 { |
| 2365 Document* document = m_frame->document(); | 2367 Document* document = m_frame->document(); |
| 2366 if (!document->renderView()) | 2368 if (!document->renderView()) |
| (...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3733 unsigned EventHandler::accessKeyModifiers() | 3735 unsigned EventHandler::accessKeyModifiers() |
| 3734 { | 3736 { |
| 3735 #if OS(MACOSX) | 3737 #if OS(MACOSX) |
| 3736 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3738 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3737 #else | 3739 #else |
| 3738 return PlatformEvent::AltKey; | 3740 return PlatformEvent::AltKey; |
| 3739 #endif | 3741 #endif |
| 3740 } | 3742 } |
| 3741 | 3743 |
| 3742 } // namespace WebCore | 3744 } // namespace WebCore |
| OLD | NEW |