Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Addressed CR feedback from Charlie. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
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 999 matching lines...)
1010 return frame()->tree().name(); 1010 return frame()->tree().name();
1011 } 1011 }
1012 1012
1013 void LocalDOMWindow::setName(const AtomicString& name) 1013 void LocalDOMWindow::setName(const AtomicString& name)
1014 { 1014 {
1015 if (!isCurrentlyDisplayedInFrame()) 1015 if (!isCurrentlyDisplayedInFrame())
1016 return; 1016 return;
1017 1017
1018 frame()->tree().setName(name); 1018 frame()->tree().setName(name);
1019 ASSERT(frame()->loader().client()); 1019 ASSERT(frame()->loader().client());
1020 frame()->loader().client()->didChangeName(name); 1020 frame()->loader().client()->didChangeName(name, frame()->tree().uniqueName() );
1021 } 1021 }
1022 1022
1023 void LocalDOMWindow::setStatus(const String& string) 1023 void LocalDOMWindow::setStatus(const String& string)
1024 { 1024 {
1025 m_status = string; 1025 m_status = string;
1026 1026
1027 if (!frame()) 1027 if (!frame())
1028 return; 1028 return;
1029 1029
1030 FrameHost* host = frame()->host(); 1030 FrameHost* host = frame()->host();
(...skipping 479 matching lines...)
1510 { 1510 {
1511 // If the LocalDOMWindow still has a frame reference, that frame must point 1511 // If the LocalDOMWindow still has a frame reference, that frame must point
1512 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1512 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1513 // where script execution leaks between different LocalDOMWindows. 1513 // where script execution leaks between different LocalDOMWindows.
1514 if (m_frameObserver->frame()) 1514 if (m_frameObserver->frame())
1515 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this); 1515 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this);
1516 return m_frameObserver->frame(); 1516 return m_frameObserver->frame();
1517 } 1517 }
1518 1518
1519 } // namespace blink 1519 } // namespace blink
OLDNEW

Powered by Google App Engine