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

Side by Side Diff: sky/engine/core/page/EventHandler.cpp

Issue 688213002: First pass at removing dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/frame/LocalFrame.cpp ('k') | sky/engine/core/rendering/InlineBox.cpp » ('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 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 Image* image = cachedImage->imageForRenderer(renderer); 903 Image* image = cachedImage->imageForRenderer(renderer);
904 // Ensure no overflow possible in calculations above. 904 // Ensure no overflow possible in calculations above.
905 if (scale < minimumCursorScale) 905 if (scale < minimumCursorScale)
906 continue; 906 continue;
907 return Cursor(image, hotSpot, scale); 907 return Cursor(image, hotSpot, scale);
908 } 908 }
909 } 909 }
910 910
911 switch (style ? style->cursor() : CURSOR_AUTO) { 911 switch (style ? style->cursor() : CURSOR_AUTO) {
912 case CURSOR_AUTO: { 912 case CURSOR_AUTO: {
913 bool horizontalText = !style || style->isHorizontalWritingMode(); 913 const Cursor& iBeam = iBeamCursor();
914 const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCurso r();
915 return selectAutoCursor(result, node, iBeam); 914 return selectAutoCursor(result, node, iBeam);
916 } 915 }
917 case CURSOR_CROSS: 916 case CURSOR_CROSS:
918 return crossCursor(); 917 return crossCursor();
919 case CURSOR_POINTER: 918 case CURSOR_POINTER:
920 return handCursor(); 919 return handCursor();
921 case CURSOR_MOVE: 920 case CURSOR_MOVE:
922 return moveCursor(); 921 return moveCursor();
923 case CURSOR_ALL_SCROLL: 922 case CURSOR_ALL_SCROLL:
924 return moveCursor(); 923 return moveCursor();
(...skipping 1888 matching lines...) Expand 10 before | Expand all | Expand 10 after
2813 unsigned EventHandler::accessKeyModifiers() 2812 unsigned EventHandler::accessKeyModifiers()
2814 { 2813 {
2815 #if OS(MACOSX) 2814 #if OS(MACOSX)
2816 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 2815 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
2817 #else 2816 #else
2818 return PlatformEvent::AltKey; 2817 return PlatformEvent::AltKey;
2819 #endif 2818 #endif
2820 } 2819 }
2821 2820
2822 } // namespace blink 2821 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/frame/LocalFrame.cpp ('k') | sky/engine/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698