Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(847)

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 14070021: Rename 'UseCounter::observe' to 'UseCounter::count'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaseline. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/ContentSecurityPolicy.cpp ('k') | Source/core/page/UseCounter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 #endif 1154 #endif
1155 1155
1156 Node* node = event.targetNode(); 1156 Node* node = event.targetNode();
1157 RenderObject* renderer = node ? node->renderer() : 0; 1157 RenderObject* renderer = node ? node->renderer() : 0;
1158 RenderStyle* style = renderer ? renderer->style() : 0; 1158 RenderStyle* style = renderer ? renderer->style() : 0;
1159 bool horizontalText = !style || style->isHorizontalWritingMode(); 1159 bool horizontalText = !style || style->isHorizontalWritingMode();
1160 const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor(); 1160 const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
1161 1161
1162 #if ENABLE(CURSOR_VISIBILITY) 1162 #if ENABLE(CURSOR_VISIBILITY)
1163 if (style && style->cursorVisibility() == CursorVisibilityAutoHide) { 1163 if (style && style->cursorVisibility() == CursorVisibilityAutoHide) {
1164 UseCounter::observe(m_frame->document(), UseCounter::CursorVisibility); 1164 UseCounter::count(m_frame->document(), UseCounter::CursorVisibility);
1165 startAutoHideCursorTimer(); 1165 startAutoHideCursorTimer();
1166 } else 1166 } else
1167 cancelAutoHideCursorTimer(); 1167 cancelAutoHideCursorTimer();
1168 #endif 1168 #endif
1169 1169
1170 // During selection, use an I-beam no matter what we're over. 1170 // During selection, use an I-beam no matter what we're over.
1171 // If a drag may be starting or we're capturing mouse events for a particula r node, don't treat this as a selection. 1171 // If a drag may be starting or we're capturing mouse events for a particula r node, don't treat this as a selection.
1172 if (m_mousePressed && m_mouseDownMayStartSelect 1172 if (m_mousePressed && m_mouseDownMayStartSelect
1173 && !m_mouseDownMayStartDrag 1173 && !m_mouseDownMayStartDrag
1174 && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode ) 1174 && m_frame->selection()->isCaretOrRange() && !m_capturingMouseEventsNode )
(...skipping 2814 matching lines...) Expand 10 before | Expand all | Expand 10 after
3989 unsigned EventHandler::accessKeyModifiers() 3989 unsigned EventHandler::accessKeyModifiers()
3990 { 3990 {
3991 #if OS(DARWIN) 3991 #if OS(DARWIN)
3992 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3992 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3993 #else 3993 #else
3994 return PlatformEvent::AltKey; 3994 return PlatformEvent::AltKey;
3995 #endif 3995 #endif
3996 } 3996 }
3997 3997
3998 } // namespace WebCore 3998 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/ContentSecurityPolicy.cpp ('k') | Source/core/page/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698