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

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

Issue 309063005: Don't attempt to print an error message if there is no console. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: remove a different check Created 6 years, 6 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
« no previous file with comments | « LayoutTests/http/tests/loading/navigate-detached-frame-window-does-not-crash-expected.txt ('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 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 688
689 Console& LocalDOMWindow::console() const 689 Console& LocalDOMWindow::console() const
690 { 690 {
691 if (!m_console) 691 if (!m_console)
692 m_console = Console::create(m_frame); 692 m_console = Console::create(m_frame);
693 return *m_console; 693 return *m_console;
694 } 694 }
695 695
696 FrameConsole* LocalDOMWindow::frameConsole() const 696 FrameConsole* LocalDOMWindow::frameConsole() const
697 { 697 {
698 if (!isCurrentlyDisplayedInFrame())
699 return 0;
700 return &m_frame->console(); 698 return &m_frame->console();
701 } 699 }
702 700
703 ApplicationCache* LocalDOMWindow::applicationCache() const 701 ApplicationCache* LocalDOMWindow::applicationCache() const
704 { 702 {
705 if (!isCurrentlyDisplayedInFrame()) 703 if (!isCurrentlyDisplayedInFrame())
706 return 0; 704 return 0;
707 if (!m_applicationCache) 705 if (!m_applicationCache)
708 m_applicationCache = ApplicationCache::create(m_frame); 706 m_applicationCache = ApplicationCache::create(m_frame);
709 return m_applicationCache.get(); 707 return m_applicationCache.get();
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1926 visitor->trace(m_localStorage); 1924 visitor->trace(m_localStorage);
1927 visitor->trace(m_applicationCache); 1925 visitor->trace(m_applicationCache);
1928 visitor->trace(m_performance); 1926 visitor->trace(m_performance);
1929 visitor->trace(m_css); 1927 visitor->trace(m_css);
1930 visitor->trace(m_eventQueue); 1928 visitor->trace(m_eventQueue);
1931 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); 1929 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
1932 EventTargetWithInlineData::trace(visitor); 1930 EventTargetWithInlineData::trace(visitor);
1933 } 1931 }
1934 1932
1935 } // namespace WebCore 1933 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/loading/navigate-detached-frame-window-does-not-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698