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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1918313002: Fix build issue with change https://codereview.chromium.org/1922903002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | no next file » | 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 RootScrollerScrollableDocumentNotHandled, // Root-scroller, scrollable docum ent, not handled. 184 RootScrollerScrollableDocumentNotHandled, // Root-scroller, scrollable docum ent, not handled.
185 RootScrollerScrollableDocumentHandled, // Root-scroller, scrollable document , handled. 185 RootScrollerScrollableDocumentHandled, // Root-scroller, scrollable document , handled.
186 TouchTargetAndDispatchResultTypeMax, 186 TouchTargetAndDispatchResultTypeMax,
187 }; 187 };
188 188
189 TouchTargetAndDispatchResultType toTouchTargetHistogramValue(EventTarget* eventT arget, DispatchEventResult dispatchResult) 189 TouchTargetAndDispatchResultType toTouchTargetHistogramValue(EventTarget* eventT arget, DispatchEventResult dispatchResult)
190 { 190 {
191 int result = 0; 191 int result = 0;
192 Document* document = nullptr; 192 Document* document = nullptr;
193 193
194 if (const LocalDOMWindow* domWindow = eventTarget->toLocalDOMWindow()) { 194 if (const LocalDOMWindow* domWindow = eventTarget->toDOMWindow()) {
195 // Treat the window as a root scroller as well. 195 // Treat the window as a root scroller as well.
196 document = domWindow->document(); 196 document = domWindow->document();
197 result += kTouchTargetHistogramRootScrollerOffset; 197 result += kTouchTargetHistogramRootScrollerOffset;
198 } else if (Node* node = eventTarget->toNode()) { 198 } else if (Node* node = eventTarget->toNode()) {
199 // Report if the target node is the document or body. 199 // Report if the target node is the document or body.
200 if (node->isDocumentNode() || static_cast<Node*>(node->document().docume ntElement()) == node || static_cast<Node*>(node->document().body()) == node) { 200 if (node->isDocumentNode() || static_cast<Node*>(node->document().docume ntElement()) == node || static_cast<Node*>(node->document().body()) == node) {
201 result += kTouchTargetHistogramRootScrollerOffset; 201 result += kTouchTargetHistogramRootScrollerOffset;
202 } 202 }
203 document = &node->document(); 203 document = &node->document();
204 } 204 }
(...skipping 3876 matching lines...) Expand 10 before | Expand all | Expand 10 after
4081 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 4081 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
4082 { 4082 {
4083 #if OS(MACOSX) 4083 #if OS(MACOSX)
4084 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 4084 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
4085 #else 4085 #else
4086 return PlatformEvent::AltKey; 4086 return PlatformEvent::AltKey;
4087 #endif 4087 #endif
4088 } 4088 }
4089 4089
4090 } // namespace blink 4090 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698