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

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

Issue 476083002: Cleanup FrameLoader::opener() to return a Frame*. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove unused forward declare. Created 6 years, 4 months 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 | « no previous file | Source/core/loader/FrameLoader.h » ('j') | 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 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 return 0; 1269 return 0;
1270 1270
1271 return m_frame->domWindow(); 1271 return m_frame->domWindow();
1272 } 1272 }
1273 1273
1274 LocalDOMWindow* LocalDOMWindow::opener() const 1274 LocalDOMWindow* LocalDOMWindow::opener() const
1275 { 1275 {
1276 if (!m_frame) 1276 if (!m_frame)
1277 return 0; 1277 return 0;
1278 1278
1279 LocalFrame* opener = m_frame->loader().opener(); 1279 Frame* opener = m_frame->loader().opener();
1280 if (!opener) 1280 if (!opener)
1281 return 0; 1281 return 0;
1282 1282
1283 return opener->domWindow(); 1283 return opener->domWindow();
1284 } 1284 }
1285 1285
1286 LocalDOMWindow* LocalDOMWindow::parent() const 1286 LocalDOMWindow* LocalDOMWindow::parent() const
1287 { 1287 {
1288 if (!m_frame) 1288 if (!m_frame)
1289 return 0; 1289 return 0;
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 visitor->trace(m_applicationCache); 1914 visitor->trace(m_applicationCache);
1915 visitor->trace(m_performance); 1915 visitor->trace(m_performance);
1916 visitor->trace(m_css); 1916 visitor->trace(m_css);
1917 visitor->trace(m_eventQueue); 1917 visitor->trace(m_eventQueue);
1918 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); 1918 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
1919 EventTargetWithInlineData::trace(visitor); 1919 EventTargetWithInlineData::trace(visitor);
1920 LifecycleContext<LocalDOMWindow>::trace(visitor); 1920 LifecycleContext<LocalDOMWindow>::trace(visitor);
1921 } 1921 }
1922 1922
1923 } // namespace blink 1923 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698