| 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 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 #endif | 1168 #endif |
| 1169 | 1169 |
| 1170 Node* node = event.targetNode(); | 1170 Node* node = event.targetNode(); |
| 1171 RenderObject* renderer = node ? node->renderer() : 0; | 1171 RenderObject* renderer = node ? node->renderer() : 0; |
| 1172 RenderStyle* style = renderer ? renderer->style() : 0; | 1172 RenderStyle* style = renderer ? renderer->style() : 0; |
| 1173 bool horizontalText = !style || style->isHorizontalWritingMode(); | 1173 bool horizontalText = !style || style->isHorizontalWritingMode(); |
| 1174 const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor(); | 1174 const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor(); |
| 1175 | 1175 |
| 1176 #if ENABLE(CURSOR_VISIBILITY) | 1176 #if ENABLE(CURSOR_VISIBILITY) |
| 1177 if (style && style->cursorVisibility() == CursorVisibilityAutoHide) { | 1177 if (style && style->cursorVisibility() == CursorVisibilityAutoHide) { |
| 1178 FeatureObserver::observe(m_frame->document(), FeatureObserver::CursorVis
ibility); | 1178 UseCounter::observe(m_frame->document(), UseCounter::CursorVisibility); |
| 1179 startAutoHideCursorTimer(); | 1179 startAutoHideCursorTimer(); |
| 1180 } else | 1180 } else |
| 1181 cancelAutoHideCursorTimer(); | 1181 cancelAutoHideCursorTimer(); |
| 1182 #endif | 1182 #endif |
| 1183 | 1183 |
| 1184 // During selection, use an I-beam no matter what we're over. | 1184 // During selection, use an I-beam no matter what we're over. |
| 1185 // If a drag may be starting or we're capturing mouse events for a particula
r node, don't treat this as a selection. | 1185 // If a drag may be starting or we're capturing mouse events for a particula
r node, don't treat this as a selection. |
| 1186 if (m_mousePressed && m_mouseDownMayStartSelect | 1186 if (m_mousePressed && m_mouseDownMayStartSelect |
| 1187 && !m_mouseDownMayStartDrag | 1187 && !m_mouseDownMayStartDrag |
| 1188 && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode
) | 1188 && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode
) |
| (...skipping 2811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4000 unsigned EventHandler::accessKeyModifiers() | 4000 unsigned EventHandler::accessKeyModifiers() |
| 4001 { | 4001 { |
| 4002 #if OS(DARWIN) | 4002 #if OS(DARWIN) |
| 4003 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 4003 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 4004 #else | 4004 #else |
| 4005 return PlatformEvent::AltKey; | 4005 return PlatformEvent::AltKey; |
| 4006 #endif | 4006 #endif |
| 4007 } | 4007 } |
| 4008 | 4008 |
| 4009 } // namespace WebCore | 4009 } // namespace WebCore |
| OLD | NEW |