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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebSocketHandshakeRequestInfo.cpp

Issue 2279763003: Revert "Move WebSocketHandleImpl into Blink" (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "public/web/WebColorSuggestion.h" 31 #include "public/platform/modules/websockets/WebSocketHandshakeRequestInfo.h"
32 32
33 #include "platform/ColorSuggestion.h" 33 #include "platform/network/WebSocketHandshakeRequest.h"
34 #include "public/platform/WebColor.h"
35 #include "public/platform/WebString.h" 34 #include "public/platform/WebString.h"
35 #include "public/platform/WebURL.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 WebColorSuggestion::WebColorSuggestion(const ColorSuggestion& suggestion) 39 WebSocketHandshakeRequestInfo::WebSocketHandshakeRequestInfo() : m_private(WebSo cketHandshakeRequest::create())
40 : color(static_cast<WebColor>(suggestion.color.rgb()))
41 , label(suggestion.label)
42 { 40 {
43 } 41 }
44 42
45 WebColorSuggestion& WebColorSuggestion::operator=(const ColorSuggestion& suggest ion) 43 WebSocketHandshakeRequestInfo::~WebSocketHandshakeRequestInfo()
46 { 44 {
47 color = static_cast<WebColor>(suggestion.color.rgb()); 45 m_private.reset();
48 label = suggestion.label; 46 }
49 return *this; 47
48 void WebSocketHandshakeRequestInfo::setURL(const WebURL& url)
49 {
50 m_private->setURL(url);
51 }
52
53 void WebSocketHandshakeRequestInfo::addHeaderField(const WebString& name, const WebString& value)
54 {
55 m_private->addAndMergeHeader(name, value);
56 }
57
58 void WebSocketHandshakeRequestInfo::setHeadersText(const WebString& text)
59 {
60 m_private->setHeadersText(text);
50 } 61 }
51 62
52 } // namespace blink 63 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698