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

Side by Side Diff: Source/core/events/CompositionEvent.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/ClipboardEvent.h ('k') | Source/core/events/CustomEvent.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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 20 matching lines...) Expand all
31 #include "core/events/UIEvent.h" 31 #include "core/events/UIEvent.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 struct CompositionEventInit : UIEventInit { 35 struct CompositionEventInit : UIEventInit {
36 CompositionEventInit(); 36 CompositionEventInit();
37 37
38 String data; 38 String data;
39 }; 39 };
40 40
41 class CompositionEvent FINAL : public UIEvent { 41 class CompositionEvent final : public UIEvent {
42 DEFINE_WRAPPERTYPEINFO(); 42 DEFINE_WRAPPERTYPEINFO();
43 public: 43 public:
44 static PassRefPtrWillBeRawPtr<CompositionEvent> create() 44 static PassRefPtrWillBeRawPtr<CompositionEvent> create()
45 { 45 {
46 return adoptRefWillBeNoop(new CompositionEvent); 46 return adoptRefWillBeNoop(new CompositionEvent);
47 } 47 }
48 48
49 static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& t ype, PassRefPtrWillBeRawPtr<AbstractView> view, const String& data, const Vector <CompositionUnderline>& underlines) 49 static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& t ype, PassRefPtrWillBeRawPtr<AbstractView> view, const String& data, const Vector <CompositionUnderline>& underlines)
50 { 50 {
51 return adoptRefWillBeNoop(new CompositionEvent(type, view, data, underli nes)); 51 return adoptRefWillBeNoop(new CompositionEvent(type, view, data, underli nes));
52 } 52 }
53 53
54 static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& t ype, const CompositionEventInit& initializer) 54 static PassRefPtrWillBeRawPtr<CompositionEvent> create(const AtomicString& t ype, const CompositionEventInit& initializer)
55 { 55 {
56 return adoptRefWillBeNoop(new CompositionEvent(type, initializer)); 56 return adoptRefWillBeNoop(new CompositionEvent(type, initializer));
57 } 57 }
58 58
59 virtual ~CompositionEvent(); 59 virtual ~CompositionEvent();
60 60
61 void initCompositionEvent(const AtomicString& type, bool canBubble, bool can celable, PassRefPtrWillBeRawPtr<AbstractView>, const String& data); 61 void initCompositionEvent(const AtomicString& type, bool canBubble, bool can celable, PassRefPtrWillBeRawPtr<AbstractView>, const String& data);
62 62
63 String data() const { return m_data; } 63 String data() const { return m_data; }
64 int activeSegmentStart() const { return m_activeSegmentStart; } 64 int activeSegmentStart() const { return m_activeSegmentStart; }
65 int activeSegmentEnd() const { return m_activeSegmentEnd; } 65 int activeSegmentEnd() const { return m_activeSegmentEnd; }
66 const Vector<unsigned>& getSegments() const { return m_segments; } 66 const Vector<unsigned>& getSegments() const { return m_segments; }
67 67
68 virtual const AtomicString& interfaceName() const OVERRIDE; 68 virtual const AtomicString& interfaceName() const override;
69 69
70 virtual void trace(Visitor*) OVERRIDE; 70 virtual void trace(Visitor*) override;
71 71
72 private: 72 private:
73 CompositionEvent(); 73 CompositionEvent();
74 CompositionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractVi ew>, const String&, const Vector<CompositionUnderline>& underlines); 74 CompositionEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractVi ew>, const String&, const Vector<CompositionUnderline>& underlines);
75 CompositionEvent(const AtomicString& type, const CompositionEventInit&); 75 CompositionEvent(const AtomicString& type, const CompositionEventInit&);
76 void initializeSegments(const Vector<CompositionUnderline>* = 0); 76 void initializeSegments(const Vector<CompositionUnderline>* = 0);
77 77
78 String m_data; 78 String m_data;
79 int m_activeSegmentStart; 79 int m_activeSegmentStart;
80 int m_activeSegmentEnd; 80 int m_activeSegmentEnd;
81 Vector<unsigned> m_segments; 81 Vector<unsigned> m_segments;
82 }; 82 };
83 83
84 } // namespace blink 84 } // namespace blink
85 85
86 #endif // CompositionEvent_h 86 #endif // CompositionEvent_h
OLDNEW
« no previous file with comments | « Source/core/events/ClipboardEvent.h ('k') | Source/core/events/CustomEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698