diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:33:40 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:33:40 +0000 |
commit | b5126da4daa8f0f0f408afb93e0683f1cf34c82a (patch) | |
tree | b08cb1a52886ec739c9ae7627249f0f3e820591c /content/child/web_socket_stream_handle_impl.h | |
parent | b4b34c8faaaae0b270aae8d2a05b6086664a9a1e (diff) | |
download | chromium_src-b5126da4daa8f0f0f408afb93e0683f1cf34c82a.zip chromium_src-b5126da4daa8f0f0f408afb93e0683f1cf34c82a.tar.gz chromium_src-b5126da4daa8f0f0f408afb93e0683f1cf34c82a.tar.bz2 |
Revert 254514 "Revert 254507 "Reland "Move WebKitPlatformSupport..."
This builds locally and on CQ. Relanding and will keep an eye out on bots, and clobber if necessary.
> Revert 254507 "Reland "Move WebKitPlatformSupportImpl over to co..."
>
> > Reland "Move WebKitPlatformSupportImpl over to content."
> >
> > In the process rename it BlinkPlatformImpl to avoid conflicts and
> > confusion with an existing WebKitPlatformSupportImpl class in content.
> >
> > This step is necessary because WebKitPlatformSupportImpl uses
> > webkit/common/user_agent/, and we also want to move user_agent to
> > content.
> >
> > So this needs to happen first because webkit can't depend on content as
> > content already depends on webkit, otherwise we would be creating a
> > circular dependency.
> >
> > WebURLLoader and WebSocketStreamHandleImpl had to be moved with
> > WebKitPlatformSupportImpl, because they both uses
> > WebKitPlatformSupportImpl and vice-versa.
> >
> > BUG=265753, 338338, 237249
> > TEST=content_unittests
> > R=jam@chromium.org
> > TBR=darin
> >
> > Review URL: https://codereview.chromium.org/180153012
>
> TBR=tfarina@chromium.org
>
> Review URL: https://codereview.chromium.org/180383006
TBR=stgao@chromium.org
Review URL: https://codereview.chromium.org/186363002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/web_socket_stream_handle_impl.h')
-rw-r--r-- | content/child/web_socket_stream_handle_impl.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/content/child/web_socket_stream_handle_impl.h b/content/child/web_socket_stream_handle_impl.h new file mode 100644 index 0000000..6e80676 --- /dev/null +++ b/content/child/web_socket_stream_handle_impl.h @@ -0,0 +1,38 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_CHILD_WEB_SOCKET_STREAM_HANDLE_IMPL_H_ +#define CONTENT_CHILD_WEB_SOCKET_STREAM_HANDLE_IMPL_H_ + +#include "base/memory/ref_counted.h" +#include "base/supports_user_data.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" + +namespace content { + +class BlinkPlatformImpl; + +class WebSocketStreamHandleImpl : public base::SupportsUserData, + public blink::WebSocketStreamHandle { + public: + explicit WebSocketStreamHandleImpl(BlinkPlatformImpl* platform); + virtual ~WebSocketStreamHandleImpl(); + + // WebSocketStreamHandle methods: + virtual void connect(const blink::WebURL& url, + blink::WebSocketStreamHandleClient* client); + virtual bool send(const blink::WebData& data); + virtual void close(); + + private: + class Context; + scoped_refptr<Context> context_; + BlinkPlatformImpl* platform_; + + DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl); +}; + +} // namespace content + +#endif // CONTENT_CHILD_WEB_SOCKET_STREAM_HANDLE_IMPL_H_ |