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

Side by Side Diff: Source/web/WebDOMMessageEvent.cpp

Issue 344833002: Oilpan: move MessagePortArray to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 6 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/web/ServiceWorkerGlobalScopeProxy.cpp ('k') | no next file » | 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) 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 namespace blink { 46 namespace blink {
47 47
48 void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId, const WebMess agePortChannelArray& webChannels) 48 void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId, const WebMess agePortChannelArray& webChannels)
49 { 49 {
50 ASSERT(m_private.get()); 50 ASSERT(m_private.get());
51 ASSERT(isMessageEvent()); 51 ASSERT(isMessageEvent());
52 LocalDOMWindow* window = 0; 52 LocalDOMWindow* window = 0;
53 if (sourceFrame) 53 if (sourceFrame)
54 window = toWebLocalFrameImpl(sourceFrame)->frame()->domWindow(); 54 window = toWebLocalFrameImpl(sourceFrame)->frame()->domWindow();
55 OwnPtr<MessagePortArray> ports; 55 OwnPtrWillBeRawPtr<MessagePortArray> ports = nullptr;
56 if (sourceFrame) 56 if (sourceFrame)
57 ports = MessagePort::toMessagePortArray(window->document(), webChannels) ; 57 ports = MessagePort::toMessagePortArray(window->document(), webChannels) ;
58 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release()); 58 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release());
59 } 59 }
60 60
61 WebSerializedScriptValue WebDOMMessageEvent::data() const 61 WebSerializedScriptValue WebDOMMessageEvent::data() const
62 { 62 {
63 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->dataAsSerialize dScriptValue()); 63 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->dataAsSerialize dScriptValue());
64 } 64 }
65 65
66 WebString WebDOMMessageEvent::origin() const 66 WebString WebDOMMessageEvent::origin() const
67 { 67 {
68 return WebString(constUnwrap<MessageEvent>()->origin()); 68 return WebString(constUnwrap<MessageEvent>()->origin());
69 } 69 }
70 70
71 WebMessagePortChannelArray WebDOMMessageEvent::releaseChannels() 71 WebMessagePortChannelArray WebDOMMessageEvent::releaseChannels()
72 { 72 {
73 MessagePortChannelArray* channels = constUnwrap<MessageEvent>()->channels(); 73 MessagePortChannelArray* channels = constUnwrap<MessageEvent>()->channels();
74 WebMessagePortChannelArray webChannels(channels ? channels->size() : 0); 74 WebMessagePortChannelArray webChannels(channels ? channels->size() : 0);
75 if (channels) { 75 if (channels) {
76 for (size_t i = 0; i < channels->size(); ++i) 76 for (size_t i = 0; i < channels->size(); ++i)
77 webChannels[i] = (*channels)[i].leakPtr(); 77 webChannels[i] = (*channels)[i].leakPtr();
78 } 78 }
79 return webChannels; 79 return webChannels;
80 } 80 }
81 81
82 } // namespace blink 82 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/ServiceWorkerGlobalScopeProxy.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698