Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: Source/core/frame/DOMWindow.cpp

Issue 89943002: Have DOMWindow name getter / setter deal with AtomicStrings (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 } 1202 }
1203 1203
1204 unsigned DOMWindow::length() const 1204 unsigned DOMWindow::length() const
1205 { 1205 {
1206 if (!isCurrentlyDisplayedInFrame()) 1206 if (!isCurrentlyDisplayedInFrame())
1207 return 0; 1207 return 0;
1208 1208
1209 return m_frame->tree().scopedChildCount(); 1209 return m_frame->tree().scopedChildCount();
1210 } 1210 }
1211 1211
1212 String DOMWindow::name() const 1212 const AtomicString& DOMWindow::name() const
1213 { 1213 {
1214 if (!m_frame) 1214 if (!m_frame)
1215 return String(); 1215 return nullAtom;
1216 1216
1217 return m_frame->tree().name(); 1217 return m_frame->tree().name();
Inactive 2013/11/27 00:31:00 This returns a "const AtomicString&"
1218 } 1218 }
1219 1219
1220 void DOMWindow::setName(const String& string) 1220 void DOMWindow::setName(const AtomicString& name)
1221 { 1221 {
1222 if (!m_frame) 1222 if (!m_frame)
1223 return; 1223 return;
1224 1224
1225 m_frame->tree().setName(string); 1225 m_frame->tree().setName(name);
Inactive 2013/11/27 00:31:00 This takes a "const AtomicString&" in argument.
1226 m_frame->loader().client()->didChangeName(string); 1226 m_frame->loader().client()->didChangeName(name);
1227 } 1227 }
1228 1228
1229 void DOMWindow::setStatus(const String& string) 1229 void DOMWindow::setStatus(const String& string)
1230 { 1230 {
1231 m_status = string; 1231 m_status = string;
1232 1232
1233 if (!m_frame) 1233 if (!m_frame)
1234 return; 1234 return;
1235 1235
1236 Page* page = m_frame->page(); 1236 Page* page = m_frame->page();
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1876 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier()); 1876 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier());
1877 } 1877 }
1878 1878
1879 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() 1879 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier()
1880 { 1880 {
1881 return DOMWindowLifecycleNotifier::create(this); 1881 return DOMWindowLifecycleNotifier::create(this);
1882 } 1882 }
1883 1883
1884 1884
1885 } // namespace WebCore 1885 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698