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

Side by Side Diff: Source/core/events/MouseRelatedEvent.h

Issue 636833002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/events (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 | « Source/core/events/MouseEvent.h ('k') | Source/core/events/MutationEvent.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) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 24 matching lines...) Expand all
35 // Note that these values are adjusted to counter the effects of zoom, s o that values 35 // Note that these values are adjusted to counter the effects of zoom, s o that values
36 // exposed via DOM APIs are invariant under zooming. 36 // exposed via DOM APIs are invariant under zooming.
37 int screenX() const { return m_screenLocation.x(); } 37 int screenX() const { return m_screenLocation.x(); }
38 int screenY() const { return m_screenLocation.y(); } 38 int screenY() const { return m_screenLocation.y(); }
39 const IntPoint& screenLocation() const { return m_screenLocation; } 39 const IntPoint& screenLocation() const { return m_screenLocation; }
40 int clientX() const { return m_clientLocation.x(); } 40 int clientX() const { return m_clientLocation.x(); }
41 int clientY() const { return m_clientLocation.y(); } 41 int clientY() const { return m_clientLocation.y(); }
42 int movementX() const { return m_movementDelta.x(); } 42 int movementX() const { return m_movementDelta.x(); }
43 int movementY() const { return m_movementDelta.y(); } 43 int movementY() const { return m_movementDelta.y(); }
44 const LayoutPoint& clientLocation() const { return m_clientLocation; } 44 const LayoutPoint& clientLocation() const { return m_clientLocation; }
45 virtual int layerX() OVERRIDE FINAL; 45 virtual int layerX() override final;
46 virtual int layerY() OVERRIDE FINAL; 46 virtual int layerY() override final;
47 int offsetX(); 47 int offsetX();
48 int offsetY(); 48 int offsetY();
49 // FIXME: rename isSimulated to fromKeyboard() and replace m_isSimulated with a new value 49 // FIXME: rename isSimulated to fromKeyboard() and replace m_isSimulated with a new value
50 // in PlatformMouseEvent::SyntheticEventType. isSimulated() is only true for synthetic 50 // in PlatformMouseEvent::SyntheticEventType. isSimulated() is only true for synthetic
51 // mouse events that derive from keyboard input, which do not have a pos ition. 51 // mouse events that derive from keyboard input, which do not have a pos ition.
52 bool isSimulated() const { return m_isSimulated; } 52 bool isSimulated() const { return m_isSimulated; }
53 virtual int pageX() const OVERRIDE FINAL; 53 virtual int pageX() const override final;
54 virtual int pageY() const OVERRIDE FINAL; 54 virtual int pageY() const override final;
55 int x() const; 55 int x() const;
56 int y() const; 56 int y() const;
57 57
58 // Page point in "absolute" coordinates (i.e. post-zoomed, page-relative coords, 58 // Page point in "absolute" coordinates (i.e. post-zoomed, page-relative coords,
59 // usable with RenderObject::absoluteToLocal). 59 // usable with RenderObject::absoluteToLocal).
60 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; } 60 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
61 void setAbsoluteLocation(const LayoutPoint& p) { m_absoluteLocation = p; } 61 void setAbsoluteLocation(const LayoutPoint& p) { m_absoluteLocation = p; }
62 62
63 virtual void trace(Visitor*) OVERRIDE; 63 virtual void trace(Visitor*) override;
64 64
65 protected: 65 protected:
66 MouseRelatedEvent(); 66 MouseRelatedEvent();
67 MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancela ble, 67 MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancela ble,
68 PassRefPtrWillBeRawPtr<AbstractView>, int detail, const IntPoint& sc reenLocation, 68 PassRefPtrWillBeRawPtr<AbstractView>, int detail, const IntPoint& sc reenLocation,
69 const IntPoint& windowLocation, const IntPoint& movementDelta, bool ctrlKey, bool altKey, 69 const IntPoint& windowLocation, const IntPoint& movementDelta, bool ctrlKey, bool altKey,
70 bool shiftKey, bool metaKey, bool isSimulated = false); 70 bool shiftKey, bool metaKey, bool isSimulated = false);
71 71
72 void initCoordinates(); 72 void initCoordinates();
73 void initCoordinates(const LayoutPoint& clientLocation); 73 void initCoordinates(const LayoutPoint& clientLocation);
74 virtual void receivedTarget() OVERRIDE FINAL; 74 virtual void receivedTarget() override final;
75 75
76 void computePageLocation(); 76 void computePageLocation();
77 void computeRelativePosition(); 77 void computeRelativePosition();
78 78
79 // Expose these so MouseEvent::initMouseEvent can set them. 79 // Expose these so MouseEvent::initMouseEvent can set them.
80 IntPoint m_screenLocation; 80 IntPoint m_screenLocation;
81 LayoutPoint m_clientLocation; 81 LayoutPoint m_clientLocation;
82 LayoutPoint m_movementDelta; 82 LayoutPoint m_movementDelta;
83 83
84 private: 84 private:
85 LayoutPoint m_pageLocation; 85 LayoutPoint m_pageLocation;
86 LayoutPoint m_layerLocation; 86 LayoutPoint m_layerLocation;
87 LayoutPoint m_offsetLocation; 87 LayoutPoint m_offsetLocation;
88 LayoutPoint m_absoluteLocation; 88 LayoutPoint m_absoluteLocation;
89 bool m_isSimulated; 89 bool m_isSimulated;
90 bool m_hasCachedRelativePosition; 90 bool m_hasCachedRelativePosition;
91 }; 91 };
92 92
93 } // namespace blink 93 } // namespace blink
94 94
95 #endif // MouseRelatedEvent_h 95 #endif // MouseRelatedEvent_h
OLDNEW
« no previous file with comments | « Source/core/events/MouseEvent.h ('k') | Source/core/events/MutationEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698