| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2010 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 return DOMURLUtilsReadOnly::search(url()); | 105 return DOMURLUtilsReadOnly::search(url()); |
| 106 } | 106 } |
| 107 | 107 |
| 108 String Location::origin() const | 108 String Location::origin() const |
| 109 { | 109 { |
| 110 if (!m_frame) | 110 if (!m_frame) |
| 111 return String(); | 111 return String(); |
| 112 return DOMURLUtilsReadOnly::origin(url()); | 112 return DOMURLUtilsReadOnly::origin(url()); |
| 113 } | 113 } |
| 114 | 114 |
| 115 PassRefPtr<DOMStringList> Location::ancestorOrigins() const | |
| 116 { | |
| 117 // FIXME(sky): remove | |
| 118 return DOMStringList::create(); | |
| 119 } | |
| 120 | |
| 121 String Location::hash() const | 115 String Location::hash() const |
| 122 { | 116 { |
| 123 if (!m_frame) | 117 if (!m_frame) |
| 124 return String(); | 118 return String(); |
| 125 | 119 |
| 126 return DOMURLUtilsReadOnly::hash(url()); | 120 return DOMURLUtilsReadOnly::hash(url()); |
| 127 } | 121 } |
| 128 | 122 |
| 129 void Location::setHref(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWin
dow, const String& url) | 123 void Location::setHref(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWin
dow, const String& url) |
| 130 { | 124 { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 // FIXME(sky): remove. | 222 // FIXME(sky): remove. |
| 229 } | 223 } |
| 230 | 224 |
| 231 void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, Loc
alDOMWindow* enteredWindow) | 225 void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, Loc
alDOMWindow* enteredWindow) |
| 232 { | 226 { |
| 233 ASSERT(m_frame); | 227 ASSERT(m_frame); |
| 234 m_frame->domWindow()->setLocation(url, callingWindow, enteredWindow); | 228 m_frame->domWindow()->setLocation(url, callingWindow, enteredWindow); |
| 235 } | 229 } |
| 236 | 230 |
| 237 } // namespace blink | 231 } // namespace blink |
| OLD | NEW |