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 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1443 | 1443 |
1444 RenderLayer* layer = renderer->enclosingLayer(); | 1444 RenderLayer* layer = renderer->enclosingLayer(); |
1445 if (!layer) | 1445 if (!layer) |
1446 return 0; | 1446 return 0; |
1447 | 1447 |
1448 return layer; | 1448 return layer; |
1449 } | 1449 } |
1450 | 1450 |
1451 ScrollableArea* EventHandler::associatedScrollableArea(const RenderLayer* layer)
const | 1451 ScrollableArea* EventHandler::associatedScrollableArea(const RenderLayer* layer)
const |
1452 { | 1452 { |
1453 ScrollableArea* layerScrollableArea = layer->scrollableArea(); | 1453 if (RenderLayerScrollableArea* scrollableArea = layer->scrollableArea()) { |
1454 if (!layerScrollableArea) | 1454 if (scrollableArea->scrollsOverflow()) |
1455 return 0; | 1455 return scrollableArea; |
1456 | |
1457 if (FrameView* frameView = m_frame->view()) { | |
1458 if (frameView->containsScrollableArea(layerScrollableArea)) | |
1459 return layerScrollableArea; | |
1460 } | 1456 } |
1461 | 1457 |
1462 return 0; | 1458 return 0; |
1463 } | 1459 } |
1464 | 1460 |
1465 bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& event) | 1461 bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& event) |
1466 { | 1462 { |
1467 TRACE_EVENT0("webkit", "EventHandler::handleMouseMoveEvent"); | 1463 TRACE_EVENT0("webkit", "EventHandler::handleMouseMoveEvent"); |
1468 | 1464 |
1469 RefPtr<FrameView> protector(m_frame->view()); | 1465 RefPtr<FrameView> protector(m_frame->view()); |
(...skipping 2569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4039 unsigned EventHandler::accessKeyModifiers() | 4035 unsigned EventHandler::accessKeyModifiers() |
4040 { | 4036 { |
4041 #if OS(MACOSX) | 4037 #if OS(MACOSX) |
4042 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 4038 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
4043 #else | 4039 #else |
4044 return PlatformEvent::AltKey; | 4040 return PlatformEvent::AltKey; |
4045 #endif | 4041 #endif |
4046 } | 4042 } |
4047 | 4043 |
4048 } // namespace WebCore | 4044 } // namespace WebCore |
OLD | NEW |