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

Side by Side Diff: Source/core/xml/XMLHttpRequestUpload.h

Issue 637483002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/xml (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/xml/XMLHttpRequestProgressEventThrottle.h ('k') | Source/core/xml/XMLSerializer.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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 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 23 matching lines...) Expand all
34 #include "wtf/PassOwnPtr.h" 34 #include "wtf/PassOwnPtr.h"
35 #include "wtf/RefCounted.h" 35 #include "wtf/RefCounted.h"
36 #include "wtf/RefPtr.h" 36 #include "wtf/RefPtr.h"
37 #include "wtf/text/AtomicStringHash.h" 37 #include "wtf/text/AtomicStringHash.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class ExecutionContext; 41 class ExecutionContext;
42 class XMLHttpRequest; 42 class XMLHttpRequest;
43 43
44 class XMLHttpRequestUpload FINAL : public NoBaseWillBeGarbageCollectedFinalized< XMLHttpRequestUpload>, public XMLHttpRequestEventTarget { 44 class XMLHttpRequestUpload final : public NoBaseWillBeGarbageCollectedFinalized< XMLHttpRequestUpload>, public XMLHttpRequestEventTarget {
45 DEFINE_WRAPPERTYPEINFO(); 45 DEFINE_WRAPPERTYPEINFO();
46 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(XMLHttpRequestUpload); 46 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(XMLHttpRequestUpload);
47 public: 47 public:
48 static PassOwnPtrWillBeRawPtr<XMLHttpRequestUpload> create(XMLHttpRequest* x mlHttpRequest) 48 static PassOwnPtrWillBeRawPtr<XMLHttpRequestUpload> create(XMLHttpRequest* x mlHttpRequest)
49 { 49 {
50 return adoptPtrWillBeNoop(new XMLHttpRequestUpload(xmlHttpRequest)); 50 return adoptPtrWillBeNoop(new XMLHttpRequestUpload(xmlHttpRequest));
51 } 51 }
52 52
53 #if !ENABLE(OILPAN) 53 #if !ENABLE(OILPAN)
54 void ref() { m_xmlHttpRequest->ref(); } 54 void ref() { m_xmlHttpRequest->ref(); }
55 void deref() { m_xmlHttpRequest->deref(); } 55 void deref() { m_xmlHttpRequest->deref(); }
56 #endif 56 #endif
57 57
58 XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; } 58 XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; }
59 59
60 virtual const AtomicString& interfaceName() const OVERRIDE; 60 virtual const AtomicString& interfaceName() const override;
61 virtual ExecutionContext* executionContext() const OVERRIDE; 61 virtual ExecutionContext* executionContext() const override;
62 62
63 void dispatchEventAndLoadEnd(const AtomicString&, bool, unsigned long long, unsigned long long); 63 void dispatchEventAndLoadEnd(const AtomicString&, bool, unsigned long long, unsigned long long);
64 void dispatchProgressEvent(unsigned long long, unsigned long long); 64 void dispatchProgressEvent(unsigned long long, unsigned long long);
65 65
66 void handleRequestError(const AtomicString&); 66 void handleRequestError(const AtomicString&);
67 67
68 virtual void trace(Visitor*) OVERRIDE; 68 virtual void trace(Visitor*) override;
69 69
70 private: 70 private:
71 explicit XMLHttpRequestUpload(XMLHttpRequest*); 71 explicit XMLHttpRequestUpload(XMLHttpRequest*);
72 72
73 #if !ENABLE(OILPAN) 73 #if !ENABLE(OILPAN)
74 virtual void refEventTarget() OVERRIDE { ref(); } 74 virtual void refEventTarget() override { ref(); }
75 virtual void derefEventTarget() OVERRIDE { deref(); } 75 virtual void derefEventTarget() override { deref(); }
76 #endif 76 #endif
77 77
78 RawPtrWillBeMember<XMLHttpRequest> m_xmlHttpRequest; 78 RawPtrWillBeMember<XMLHttpRequest> m_xmlHttpRequest;
79 EventTargetData m_eventTargetData; 79 EventTargetData m_eventTargetData;
80 80
81 // Last progress event values; used when issuing the 81 // Last progress event values; used when issuing the
82 // required 'progress' event on a request error or abort. 82 // required 'progress' event on a request error or abort.
83 unsigned long long m_lastBytesSent; 83 unsigned long long m_lastBytesSent;
84 unsigned long long m_lastTotalBytesToBeSent; 84 unsigned long long m_lastTotalBytesToBeSent;
85 }; 85 };
86 86
87 } // namespace blink 87 } // namespace blink
88 88
89 #endif // XMLHttpRequestUpload_h 89 #endif // XMLHttpRequestUpload_h
OLDNEW
« no previous file with comments | « Source/core/xml/XMLHttpRequestProgressEventThrottle.h ('k') | Source/core/xml/XMLSerializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698