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

Unified Diff: Source/core/dom/MessagePort.h

Issue 460393003: Cleanup namespace usage in Source/core/{dom/* & fileapi/*} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Error and Rebase Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/MessageChannel.cpp ('k') | Source/core/dom/MessagePort.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/MessagePort.h
diff --git a/Source/core/dom/MessagePort.h b/Source/core/dom/MessagePort.h
index cdbb4cd658ca332b0acc1ecce8663da227f60e18..e66eb7df180cfff3d3fb4d65783f34ef85e055ab 100644
--- a/Source/core/dom/MessagePort.h
+++ b/Source/core/dom/MessagePort.h
@@ -50,13 +50,13 @@ class SerializedScriptValue;
// The overwhelmingly common case is sending a single port, so handle that efficiently with an inline buffer of size 1.
typedef WillBeHeapVector<RefPtrWillBeMember<MessagePort>, 1> MessagePortArray;
-// Not to be confused with blink::WebMessagePortChannelArray; this one uses Vector and OwnPtr instead of WebVector and raw pointers.
-typedef Vector<OwnPtr<blink::WebMessagePortChannel>, 1> MessagePortChannelArray;
+// Not to be confused with WebMessagePortChannelArray; this one uses Vector and OwnPtr instead of WebVector and raw pointers.
+typedef Vector<OwnPtr<WebMessagePortChannel>, 1> MessagePortChannelArray;
class MessagePort FINAL : public RefCountedWillBeRefCountedGarbageCollected<MessagePort>
, public ActiveDOMObject
, public EventTargetWithInlineData
- , public blink::WebMessagePortChannelClient {
+ , public WebMessagePortChannelClient {
REFCOUNTED_EVENT_TARGET(MessagePort);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MessagePort);
public:
@@ -68,11 +68,11 @@ public:
void start();
void close();
- void entangle(PassOwnPtr<blink::WebMessagePortChannel>);
- PassOwnPtr<blink::WebMessagePortChannel> disentangle();
+ void entangle(PassOwnPtr<WebMessagePortChannel>);
+ PassOwnPtr<WebMessagePortChannel> disentangle();
- static PassOwnPtr<blink::WebMessagePortChannelArray> toWebMessagePortChannelArray(PassOwnPtr<MessagePortChannelArray>);
- static PassOwnPtrWillBeRawPtr<MessagePortArray> toMessagePortArray(ExecutionContext*, const blink::WebMessagePortChannelArray&);
+ static PassOwnPtr<WebMessagePortChannelArray> toWebMessagePortChannelArray(PassOwnPtr<MessagePortChannelArray>);
+ static PassOwnPtrWillBeRawPtr<MessagePortArray> toMessagePortArray(ExecutionContext*, const WebMessagePortChannelArray&);
// Returns 0 if there is an exception, or if the passed-in array is 0/empty.
static PassOwnPtr<MessagePortChannelArray> disentanglePorts(const MessagePortArray*, ExceptionState&);
@@ -110,7 +110,7 @@ private:
virtual void messageAvailable() OVERRIDE;
void dispatchMessages();
- OwnPtr<blink::WebMessagePortChannel> m_entangledChannel;
+ OwnPtr<WebMessagePortChannel> m_entangledChannel;
bool m_started;
bool m_closed;
« no previous file with comments | « Source/core/dom/MessageChannel.cpp ('k') | Source/core/dom/MessagePort.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698