| 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();
|
| }
|
|
|