| 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 29 matching lines...) Expand all Loading... |
| 40 #include "platform/weborigin/KURL.h" | 40 #include "platform/weborigin/KURL.h" |
| 41 #include "platform/weborigin/SecurityOrigin.h" | 41 #include "platform/weborigin/SecurityOrigin.h" |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 Location::Location(Frame* frame) | 45 Location::Location(Frame* frame) |
| 46 : m_frame(frame) | 46 : m_frame(frame) |
| 47 { | 47 { |
| 48 } | 48 } |
| 49 | 49 |
| 50 void Location::trace(Visitor* visitor) | 50 DEFINE_TRACE(Location) |
| 51 { | 51 { |
| 52 visitor->trace(m_frame); | 52 visitor->trace(m_frame); |
| 53 } | 53 } |
| 54 | 54 |
| 55 inline const KURL& Location::url() const | 55 inline const KURL& Location::url() const |
| 56 { | 56 { |
| 57 const KURL& url = toLocalFrame(m_frame)->document()->url(); | 57 const KURL& url = toLocalFrame(m_frame)->document()->url(); |
| 58 if (!url.isValid()) | 58 if (!url.isValid()) |
| 59 return blankURL(); // Use "about:blank" while the page is still loading
(before we have a frame). | 59 return blankURL(); // Use "about:blank" while the page is still loading
(before we have a frame). |
| 60 | 60 |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 argv.append("LocalDOMWindow"); | 267 argv.append("LocalDOMWindow"); |
| 268 argv.append("url"); | 268 argv.append("url"); |
| 269 argv.append(enteredDocument->url()); | 269 argv.append(enteredDocument->url()); |
| 270 argv.append(completedURL); | 270 argv.append(completedURL); |
| 271 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); | 271 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); |
| 272 } | 272 } |
| 273 m_frame->navigate(*callingWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame); | 273 m_frame->navigate(*callingWindow->document(), completedURL, locationPolicy =
= SetLocation::ReplaceThisFrame); |
| 274 } | 274 } |
| 275 | 275 |
| 276 } // namespace blink | 276 } // namespace blink |
| OLD | NEW |