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

Side by Side Diff: sky/engine/core/dom/DOMURL.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/dom/DOMURL.h ('k') | sky/engine/core/dom/Document.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2012 Motorola Mobility Inc. 3 * Copyright (C) 2012 Motorola Mobility Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/dom/DOMURL.h" 28 #include "sky/engine/core/dom/DOMURL.h"
29 29
30 #include "sky/engine/bindings/core/v8/ExceptionMessages.h" 30 #include "sky/engine/bindings2/exception_messages.h"
31 #include "sky/engine/bindings/core/v8/ExceptionState.h" 31 #include "sky/engine/bindings2/exception_state.h"
32 #include "sky/engine/core/dom/ExceptionCode.h" 32 #include "sky/engine/core/dom/ExceptionCode.h"
33 #include "sky/engine/core/dom/ExecutionContext.h" 33 #include "sky/engine/core/dom/ExecutionContext.h"
34 #include "sky/engine/core/fetch/MemoryCache.h" 34 #include "sky/engine/core/fetch/MemoryCache.h"
35 #include "sky/engine/wtf/MainThread.h" 35 #include "sky/engine/wtf/MainThread.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 DOMURL::DOMURL(const String& url, const KURL& base, ExceptionState& exceptionSta te) 39 DOMURL::DOMURL(const String& url, const KURL& base, ExceptionState& exceptionSta te)
40 { 40 {
41 if (!base.isValid()) 41 if (!base.isValid())
42 exceptionState.throwDOMException(SyntaxError, "Invalid base URL"); 42 exceptionState.ThrowDOMException(SyntaxError, "Invalid base URL");
43 43
44 m_url = KURL(base, url); 44 m_url = KURL(base, url);
45 if (!m_url.isValid()) 45 if (!m_url.isValid())
46 exceptionState.throwDOMException(SyntaxError, "Invalid URL"); 46 exceptionState.ThrowDOMException(SyntaxError, "Invalid URL");
47 } 47 }
48 48
49 void DOMURL::setInput(const String& value) 49 void DOMURL::setInput(const String& value)
50 { 50 {
51 KURL url(blankURL(), value); 51 KURL url(blankURL(), value);
52 if (url.isValid()) { 52 if (url.isValid()) {
53 m_url = url; 53 m_url = url;
54 m_input = String(); 54 m_input = String();
55 } else { 55 } else {
56 m_url = KURL(); 56 m_url = KURL();
57 m_input = value; 57 m_input = value;
58 } 58 }
59 } 59 }
60 60
61 } // namespace blink 61 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/dom/DOMURL.h ('k') | sky/engine/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698