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

Side by Side Diff: Source/core/dom/MessageChannel.cpp

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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/ExecutionContextClient.h ('k') | Source/core/dom/MessagePort.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 19 matching lines...) Expand all
30 #include "core/dom/MessagePort.h" 30 #include "core/dom/MessagePort.h"
31 #include "public/platform/Platform.h" 31 #include "public/platform/Platform.h"
32 #include "public/platform/WebMessagePortChannel.h" 32 #include "public/platform/WebMessagePortChannel.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MessageChannel); 36 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MessageChannel);
37 37
38 static void createChannel(MessagePort* port1, MessagePort* port2) 38 static void createChannel(MessagePort* port1, MessagePort* port2)
39 { 39 {
40 blink::WebMessagePortChannel* channel1; 40 WebMessagePortChannel* channel1;
41 blink::WebMessagePortChannel* channel2; 41 WebMessagePortChannel* channel2;
42 blink::Platform::current()->createMessageChannel(&channel1, &channel2); 42 Platform::current()->createMessageChannel(&channel1, &channel2);
43 ASSERT(channel1 && channel2); 43 ASSERT(channel1 && channel2);
44 44
45 // Now entangle the proxies with the appropriate local ports. 45 // Now entangle the proxies with the appropriate local ports.
46 port1->entangle(adoptPtr(channel2)); 46 port1->entangle(adoptPtr(channel2));
47 port2->entangle(adoptPtr(channel1)); 47 port2->entangle(adoptPtr(channel1));
48 } 48 }
49 49
50 MessageChannel::MessageChannel(ExecutionContext* context) 50 MessageChannel::MessageChannel(ExecutionContext* context)
51 : m_port1(MessagePort::create(*context)) 51 : m_port1(MessagePort::create(*context))
52 , m_port2(MessagePort::create(*context)) 52 , m_port2(MessagePort::create(*context))
53 { 53 {
54 ScriptWrappable::init(this); 54 ScriptWrappable::init(this);
55 createChannel(m_port1.get(), m_port2.get()); 55 createChannel(m_port1.get(), m_port2.get());
56 } 56 }
57 57
58 void MessageChannel::trace(Visitor* visitor) 58 void MessageChannel::trace(Visitor* visitor)
59 { 59 {
60 visitor->trace(m_port1); 60 visitor->trace(m_port1);
61 visitor->trace(m_port2); 61 visitor->trace(m_port2);
62 } 62 }
63 63
64 } // namespace blink 64 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/ExecutionContextClient.h ('k') | Source/core/dom/MessagePort.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698