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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 return String(); | 116 return String(); |
117 return DOMURLUtilsReadOnly::origin(url()); | 117 return DOMURLUtilsReadOnly::origin(url()); |
118 } | 118 } |
119 | 119 |
120 PassRefPtrWillBeRawPtr<DOMStringList> Location::ancestorOrigins() const | 120 PassRefPtrWillBeRawPtr<DOMStringList> Location::ancestorOrigins() const |
121 { | 121 { |
122 RefPtrWillBeRawPtr<DOMStringList> origins = DOMStringList::create(DOMStringL
ist::Location); | 122 RefPtrWillBeRawPtr<DOMStringList> origins = DOMStringList::create(DOMStringL
ist::Location); |
123 if (!m_frame) | 123 if (!m_frame) |
124 return origins.release(); | 124 return origins.release(); |
125 for (Frame* frame = m_frame->tree().parent(); frame; frame = frame->tree().p
arent()) | 125 for (Frame* frame = m_frame->tree().parent(); frame; frame = frame->tree().p
arent()) |
126 origins->append(frame->securityContext()->securityOrigin()->toString()); | 126 origins->append(frame->securityContext()->getSecurityOrigin()->toString(
)); |
127 return origins.release(); | 127 return origins.release(); |
128 } | 128 } |
129 | 129 |
130 String Location::hash() const | 130 String Location::hash() const |
131 { | 131 { |
132 if (!m_frame) | 132 if (!m_frame) |
133 return String(); | 133 return String(); |
134 | 134 |
135 return DOMURLUtilsReadOnly::hash(url()); | 135 return DOMURLUtilsReadOnly::hash(url()); |
136 } | 136 } |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 argv.append("LocalDOMWindow"); | 270 argv.append("LocalDOMWindow"); |
271 argv.append("url"); | 271 argv.append("url"); |
272 argv.append(enteredDocument->url()); | 272 argv.append(enteredDocument->url()); |
273 argv.append(completedURL); | 273 argv.append(completedURL); |
274 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); | 274 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); |
275 } | 275 } |
276 m_frame->navigate(*currentWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame, UserGestureStatus::None); | 276 m_frame->navigate(*currentWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame, UserGestureStatus::None); |
277 } | 277 } |
278 | 278 |
279 } // namespace blink | 279 } // namespace blink |
OLD | NEW |