| 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 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1000 return frame()->tree().name(); | 1000 return frame()->tree().name(); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 void LocalDOMWindow::setName(const AtomicString& name) | 1003 void LocalDOMWindow::setName(const AtomicString& name) |
| 1004 { | 1004 { |
| 1005 if (!isCurrentlyDisplayedInFrame()) | 1005 if (!isCurrentlyDisplayedInFrame()) |
| 1006 return; | 1006 return; |
| 1007 | 1007 |
| 1008 frame()->tree().setName(name); | 1008 frame()->tree().setName(name); |
| 1009 ASSERT(frame()->loader().client()); | 1009 ASSERT(frame()->loader().client()); |
| 1010 frame()->loader().client()->didChangeName(name); | 1010 frame()->loader().client()->didChangeName(name, frame()->tree().uniqueName()
); |
| 1011 } | 1011 } |
| 1012 | 1012 |
| 1013 void LocalDOMWindow::setStatus(const String& string) | 1013 void LocalDOMWindow::setStatus(const String& string) |
| 1014 { | 1014 { |
| 1015 m_status = string; | 1015 m_status = string; |
| 1016 | 1016 |
| 1017 if (!frame()) | 1017 if (!frame()) |
| 1018 return; | 1018 return; |
| 1019 | 1019 |
| 1020 FrameHost* host = frame()->host(); | 1020 FrameHost* host = frame()->host(); |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 { | 1500 { |
| 1501 // If the LocalDOMWindow still has a frame reference, that frame must point | 1501 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1502 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1502 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1503 // where script execution leaks between different LocalDOMWindows. | 1503 // where script execution leaks between different LocalDOMWindows. |
| 1504 if (m_frameObserver->frame()) | 1504 if (m_frameObserver->frame()) |
| 1505 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); | 1505 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); |
| 1506 return m_frameObserver->frame(); | 1506 return m_frameObserver->frame(); |
| 1507 } | 1507 } |
| 1508 | 1508 |
| 1509 } // namespace blink | 1509 } // namespace blink |
| OLD | NEW |