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

Side by Side Diff: third_party/WebKit/Source/core/fileapi/FileReader.h

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 void readAsArrayBuffer(Blob*, ExceptionState&); 67 void readAsArrayBuffer(Blob*, ExceptionState&);
68 void readAsBinaryString(Blob*, ExceptionState&); 68 void readAsBinaryString(Blob*, ExceptionState&);
69 void readAsText(Blob*, const String& encoding, ExceptionState&); 69 void readAsText(Blob*, const String& encoding, ExceptionState&);
70 void readAsText(Blob*, ExceptionState&); 70 void readAsText(Blob*, ExceptionState&);
71 void readAsDataURL(Blob*, ExceptionState&); 71 void readAsDataURL(Blob*, ExceptionState&);
72 void abort(); 72 void abort();
73 73
74 void doAbort(); 74 void doAbort();
75 75
76 ReadyState readyState() const { return m_state; } 76 ReadyState getReadyState() const { return m_state; }
77 FileError* error() { return m_error; } 77 FileError* error() { return m_error; }
78 void result(StringOrArrayBuffer& resultAttribute) const; 78 void result(StringOrArrayBuffer& resultAttribute) const;
79 79
80 // ActiveDOMObject 80 // ActiveDOMObject
81 void stop() override; 81 void stop() override;
82 bool hasPendingActivity() const override; 82 bool hasPendingActivity() const override;
83 83
84 // EventTarget 84 // EventTarget
85 const AtomicString& interfaceName() const override; 85 const AtomicString& interfaceName() const override;
86 ExecutionContext* executionContext() const override { return ActiveDOMObject ::executionContext(); } 86 ExecutionContext* executionContext() const override { return ActiveDOMObject ::executionContext(); }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 OwnPtr<FileReaderLoader> m_loader; 131 OwnPtr<FileReaderLoader> m_loader;
132 Member<FileError> m_error; 132 Member<FileError> m_error;
133 double m_lastProgressNotificationTimeMS; 133 double m_lastProgressNotificationTimeMS;
134 int m_asyncOperationId; 134 int m_asyncOperationId;
135 }; 135 };
136 136
137 } // namespace blink 137 } // namespace blink
138 138
139 #endif // FileReader_h 139 #endif // FileReader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileList.cpp ('k') | third_party/WebKit/Source/core/fileapi/FileReader.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698