| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 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 * 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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 return frame()->tree().name(); | 1017 return frame()->tree().name(); |
| 1018 } | 1018 } |
| 1019 | 1019 |
| 1020 void LocalDOMWindow::setName(const AtomicString& name) | 1020 void LocalDOMWindow::setName(const AtomicString& name) |
| 1021 { | 1021 { |
| 1022 if (!isCurrentlyDisplayedInFrame()) | 1022 if (!isCurrentlyDisplayedInFrame()) |
| 1023 return; | 1023 return; |
| 1024 | 1024 |
| 1025 frame()->tree().setName(name); | 1025 frame()->tree().setName(name); |
| 1026 ASSERT(frame()->loader().client()); | 1026 ASSERT(frame()->loader().client()); |
| 1027 frame()->loader().client()->didChangeName(name); | 1027 frame()->loader().client()->didChangeName(name, frame()->tree().uniqueName()
); |
| 1028 } | 1028 } |
| 1029 | 1029 |
| 1030 void LocalDOMWindow::setStatus(const String& string) | 1030 void LocalDOMWindow::setStatus(const String& string) |
| 1031 { | 1031 { |
| 1032 m_status = string; | 1032 m_status = string; |
| 1033 | 1033 |
| 1034 if (!frame()) | 1034 if (!frame()) |
| 1035 return; | 1035 return; |
| 1036 | 1036 |
| 1037 FrameHost* host = frame()->host(); | 1037 FrameHost* host = frame()->host(); |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1519 { | 1519 { |
| 1520 // If the LocalDOMWindow still has a frame reference, that frame must point | 1520 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1521 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1521 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1522 // where script execution leaks between different LocalDOMWindows. | 1522 // where script execution leaks between different LocalDOMWindows. |
| 1523 if (m_frameObserver->frame()) | 1523 if (m_frameObserver->frame()) |
| 1524 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); | 1524 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); |
| 1525 return m_frameObserver->frame(); | 1525 return m_frameObserver->frame(); |
| 1526 } | 1526 } |
| 1527 | 1527 |
| 1528 } // namespace blink | 1528 } // namespace blink |
| OLD | NEW |