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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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/EventHandler.h ('k') | Source/core/page/PrintContext.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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "core/frame/Settings.h" 59 #include "core/frame/Settings.h"
60 #include "core/html/HTMLDialogElement.h" 60 #include "core/html/HTMLDialogElement.h"
61 #include "core/html/HTMLFrameElementBase.h" 61 #include "core/html/HTMLFrameElementBase.h"
62 #include "core/html/HTMLFrameSetElement.h" 62 #include "core/html/HTMLFrameSetElement.h"
63 #include "core/html/HTMLInputElement.h" 63 #include "core/html/HTMLInputElement.h"
64 #include "core/layout/HitTestRequest.h" 64 #include "core/layout/HitTestRequest.h"
65 #include "core/layout/HitTestResult.h" 65 #include "core/layout/HitTestResult.h"
66 #include "core/layout/LayoutPart.h" 66 #include "core/layout/LayoutPart.h"
67 #include "core/layout/LayoutTextControlSingleLine.h" 67 #include "core/layout/LayoutTextControlSingleLine.h"
68 #include "core/layout/LayoutView.h" 68 #include "core/layout/LayoutView.h"
69 #include "core/layout/style/LayoutStyle.h" 69 #include "core/layout/style/ComputedStyle.h"
70 #include "core/loader/FrameLoader.h" 70 #include "core/loader/FrameLoader.h"
71 #include "core/loader/FrameLoaderClient.h" 71 #include "core/loader/FrameLoaderClient.h"
72 #include "core/page/AutoscrollController.h" 72 #include "core/page/AutoscrollController.h"
73 #include "core/page/Chrome.h" 73 #include "core/page/Chrome.h"
74 #include "core/page/ChromeClient.h" 74 #include "core/page/ChromeClient.h"
75 #include "core/page/DragController.h" 75 #include "core/page/DragController.h"
76 #include "core/page/DragState.h" 76 #include "core/page/DragState.h"
77 #include "core/page/EditorClient.h" 77 #include "core/page/EditorClient.h"
78 #include "core/page/FocusController.h" 78 #include "core/page/FocusController.h"
79 #include "core/page/FrameTree.h" 79 #include "core/page/FrameTree.h"
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 #if OS(WIN) 1081 #if OS(WIN)
1082 if (panScrollInProgress()) 1082 if (panScrollInProgress())
1083 return NoCursorChange; 1083 return NoCursorChange;
1084 #endif 1084 #endif
1085 1085
1086 Node* node = result.innerPossiblyPseudoNode(); 1086 Node* node = result.innerPossiblyPseudoNode();
1087 if (!node) 1087 if (!node)
1088 return selectAutoCursor(result, node, iBeamCursor()); 1088 return selectAutoCursor(result, node, iBeamCursor());
1089 1089
1090 LayoutObject* renderer = node->layoutObject(); 1090 LayoutObject* renderer = node->layoutObject();
1091 const LayoutStyle* style = renderer ? renderer->style() : nullptr; 1091 const ComputedStyle* style = renderer ? renderer->style() : nullptr;
1092 1092
1093 if (renderer) { 1093 if (renderer) {
1094 Cursor overrideCursor; 1094 Cursor overrideCursor;
1095 switch (renderer->getCursor(roundedIntPoint(result.localPoint()), overri deCursor)) { 1095 switch (renderer->getCursor(roundedIntPoint(result.localPoint()), overri deCursor)) {
1096 case SetCursorBasedOnStyle: 1096 case SetCursorBasedOnStyle:
1097 break; 1097 break;
1098 case SetCursor: 1098 case SetCursor:
1099 return overrideCursor; 1099 return overrideCursor;
1100 case DoNotSetCursor: 1100 case DoNotSetCursor:
1101 return NoCursorChange; 1101 return NoCursorChange;
(...skipping 2892 matching lines...) Expand 10 before | Expand all | Expand 10 after
3994 unsigned EventHandler::accessKeyModifiers() 3994 unsigned EventHandler::accessKeyModifiers()
3995 { 3995 {
3996 #if OS(MACOSX) 3996 #if OS(MACOSX)
3997 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3997 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3998 #else 3998 #else
3999 return PlatformEvent::AltKey; 3999 return PlatformEvent::AltKey;
4000 #endif 4000 #endif
4001 } 4001 }
4002 4002
4003 } // namespace blink 4003 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.h ('k') | Source/core/page/PrintContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698