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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/WebCore.gypi ('k') | Source/WebCore/platform/network/SocketStreamErrorBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/chromium/support/WebSocketStreamError.cpp
diff --git a/Source/WebKit/chromium/src/WebGeolocationError.cpp b/Source/WebCore/platform/chromium/support/WebSocketStreamError.cpp
similarity index 71%
copy from Source/WebKit/chromium/src/WebGeolocationError.cpp
copy to Source/WebCore/platform/chromium/support/WebSocketStreamError.cpp
index aa6e0d7fceb06d1d0c14fa6de5757ebe85917055..f6b394db4a2e1fea62b12d88c6fccfb9469851f8 100644
--- a/Source/WebKit/chromium/src/WebGeolocationError.cpp
+++ b/Source/WebCore/platform/chromium/support/WebSocketStreamError.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Intel Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,42 +24,42 @@
*/
#include "config.h"
-#include "WebGeolocationError.h"
+#include <public/WebSocketStreamError.h>
-#include "GeolocationError.h"
+#include "SocketStreamError.h"
#include <public/WebString.h>
using namespace WebCore;
namespace WebKit {
-void WebGeolocationError::assign(Error code, const WebString& message)
+void WebSocketStreamError::assign(int code, const WebString& message)
{
- m_private = GeolocationError::create(static_cast<GeolocationError::ErrorCode>(code), message);
+ m_private = SocketStreamError::create(code, message);
}
-void WebGeolocationError::assign(const WebGeolocationError& other)
+void WebSocketStreamError::assign(const WebSocketStreamError& other)
{
m_private = other.m_private;
}
-void WebGeolocationError::reset()
+void WebSocketStreamError::reset()
{
m_private.reset();
}
-WebGeolocationError::WebGeolocationError(PassRefPtr<GeolocationError> error)
+WebSocketStreamError::WebSocketStreamError(PassRefPtr<SocketStreamError> error)
{
m_private = error;
}
-WebGeolocationError& WebGeolocationError::operator=(PassRefPtr<GeolocationError> error)
+WebSocketStreamError& WebSocketStreamError::operator=(PassRefPtr<SocketStreamError> error)
{
m_private = error;
return *this;
}
-WebGeolocationError::operator PassRefPtr<GeolocationError>() const
+WebSocketStreamError::operator PassRefPtr<SocketStreamError>() const
{
return m_private.get();
}
« 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