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

Side by Side Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocket.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 String binaryType() const; 104 String binaryType() const;
105 void setBinaryType(const String&); 105 void setBinaryType(const String&);
106 106
107 DEFINE_ATTRIBUTE_EVENT_LISTENER(open); 107 DEFINE_ATTRIBUTE_EVENT_LISTENER(open);
108 DEFINE_ATTRIBUTE_EVENT_LISTENER(message); 108 DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
109 DEFINE_ATTRIBUTE_EVENT_LISTENER(error); 109 DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
110 DEFINE_ATTRIBUTE_EVENT_LISTENER(close); 110 DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
111 111
112 // EventTarget functions. 112 // EventTarget functions.
113 const AtomicString& interfaceName() const override; 113 const AtomicString& interfaceName() const override;
114 ExecutionContext* executionContext() const override; 114 ExecutionContext* getExecutionContext() const override;
115 115
116 // ActiveDOMObject functions. 116 // ActiveDOMObject functions.
117 void contextDestroyed() override; 117 void contextDestroyed() override;
118 // Prevent this instance from being collected while it's not in CLOSED 118 // Prevent this instance from being collected while it's not in CLOSED
119 // state. 119 // state.
120 bool hasPendingActivity() const override; 120 bool hasPendingActivity() const override;
121 void suspend() override; 121 void suspend() override;
122 void resume() override; 122 void resume() override;
123 void stop() override; 123 void stop() override;
124 124
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 String m_subprotocol; 239 String m_subprotocol;
240 String m_extensions; 240 String m_extensions;
241 241
242 Member<EventQueue> m_eventQueue; 242 Member<EventQueue> m_eventQueue;
243 Timer<DOMWebSocket> m_bufferedAmountConsumeTimer; 243 Timer<DOMWebSocket> m_bufferedAmountConsumeTimer;
244 }; 244 };
245 245
246 } // namespace blink 246 } // namespace blink
247 247
248 #endif // DOMWebSocket_h 248 #endif // DOMWebSocket_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp ('k') | third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698