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

Side by Side Diff: Source/modules/websockets/WebSocket.cpp

Issue 267323004: Oilpan: Move ThreadableWebSocketChannelClientWrapper to Oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 : ActiveDOMObject(context) 230 : ActiveDOMObject(context)
231 , m_state(CONNECTING) 231 , m_state(CONNECTING)
232 , m_bufferedAmount(0) 232 , m_bufferedAmount(0)
233 , m_bufferedAmountAfterClose(0) 233 , m_bufferedAmountAfterClose(0)
234 , m_binaryType(BinaryTypeBlob) 234 , m_binaryType(BinaryTypeBlob)
235 , m_subprotocol("") 235 , m_subprotocol("")
236 , m_extensions("") 236 , m_extensions("")
237 , m_eventQueue(EventQueue::create(this)) 237 , m_eventQueue(EventQueue::create(this))
238 { 238 {
239 ScriptWrappable::init(this); 239 ScriptWrappable::init(this);
240 fprintf(stderr, "WebSocket() %ld %p\n", pthread_self(), this);
240 } 241 }
241 242
242 WebSocket::~WebSocket() 243 WebSocket::~WebSocket()
243 { 244 {
245 fprintf(stderr, "~WebSocket() %ld %p\n", pthread_self(), this);
244 ASSERT(!m_channel); 246 ASSERT(!m_channel);
245 } 247 }
246 248
247 void WebSocket::logError(const String& message) 249 void WebSocket::logError(const String& message)
248 { 250 {
249 executionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, me ssage); 251 executionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, me ssage);
250 } 252 }
251 253
252 PassRefPtrWillBeRawPtr<WebSocket> WebSocket::create(ExecutionContext* context, c onst String& url, ExceptionState& exceptionState) 254 PassRefPtrWillBeRawPtr<WebSocket> WebSocket::create(ExecutionContext* context, c onst String& url, ExceptionState& exceptionState)
253 { 255 {
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 return overhead; 685 return overhead;
684 } 686 }
685 687
686 void WebSocket::trace(Visitor* visitor) 688 void WebSocket::trace(Visitor* visitor)
687 { 689 {
688 visitor->trace(m_channel); 690 visitor->trace(m_channel);
689 visitor->trace(m_eventQueue); 691 visitor->trace(m_eventQueue);
690 } 692 }
691 693
692 } // namespace WebCore 694 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698