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

Side by Side Diff: Source/WebCore/platform/chromium/support/WebSocketStreamError.cpp

Issue 13776002: MediaStream should fire ended event when all tracks are ended (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: The patch is migrated from WebKit #bug 87336 Created 7 years, 8 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/WebCore/WebCore.gypi ('k') | Source/WebCore/platform/network/SocketStreamErrorBase.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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Intel 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "WebGeolocationError.h" 27 #include <public/WebSocketStreamError.h>
28 28
29 #include "GeolocationError.h" 29 #include "SocketStreamError.h"
30 #include <public/WebString.h> 30 #include <public/WebString.h>
31 31
32 using namespace WebCore; 32 using namespace WebCore;
33 33
34 namespace WebKit { 34 namespace WebKit {
35 35
36 void WebGeolocationError::assign(Error code, const WebString& message) 36 void WebSocketStreamError::assign(int code, const WebString& message)
37 { 37 {
38 m_private = GeolocationError::create(static_cast<GeolocationError::ErrorCode >(code), message); 38 m_private = SocketStreamError::create(code, message);
39 } 39 }
40 40
41 void WebGeolocationError::assign(const WebGeolocationError& other) 41 void WebSocketStreamError::assign(const WebSocketStreamError& other)
42 { 42 {
43 m_private = other.m_private; 43 m_private = other.m_private;
44 } 44 }
45 45
46 void WebGeolocationError::reset() 46 void WebSocketStreamError::reset()
47 { 47 {
48 m_private.reset(); 48 m_private.reset();
49 } 49 }
50 50
51 WebGeolocationError::WebGeolocationError(PassRefPtr<GeolocationError> error) 51 WebSocketStreamError::WebSocketStreamError(PassRefPtr<SocketStreamError> error)
52 { 52 {
53 m_private = error; 53 m_private = error;
54 } 54 }
55 55
56 WebGeolocationError& WebGeolocationError::operator=(PassRefPtr<GeolocationError> error) 56 WebSocketStreamError& WebSocketStreamError::operator=(PassRefPtr<SocketStreamErr or> error)
57 { 57 {
58 m_private = error; 58 m_private = error;
59 return *this; 59 return *this;
60 } 60 }
61 61
62 WebGeolocationError::operator PassRefPtr<GeolocationError>() const 62 WebSocketStreamError::operator PassRefPtr<SocketStreamError>() const
63 { 63 {
64 return m_private.get(); 64 return m_private.get();
65 } 65 }
66 66
67 } 67 }
OLDNEW
« no previous file with comments | « Source/WebCore/WebCore.gypi ('k') | Source/WebCore/platform/network/SocketStreamErrorBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698