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

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

Issue 51033005: Add a use counter and deprecation message for showModalDialog (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add missing result Created 7 years, 1 month 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
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 1820 matching lines...) Expand 10 before | Expand all | Expand 10 after
1831 Frame* activeFrame = activeWindow->frame(); 1831 Frame* activeFrame = activeWindow->frame();
1832 if (!activeFrame) 1832 if (!activeFrame)
1833 return; 1833 return;
1834 Frame* firstFrame = firstWindow->frame(); 1834 Frame* firstFrame = firstWindow->frame();
1835 if (!firstFrame) 1835 if (!firstFrame)
1836 return; 1836 return;
1837 1837
1838 if (!canShowModalDialogNow(m_frame) || !firstWindow->allowPopUp()) 1838 if (!canShowModalDialogNow(m_frame) || !firstWindow->allowPopUp())
1839 return; 1839 return;
1840 1840
1841 UseCounter::countDeprecation(this, UseCounter::ShowModalDialog);
1842
1841 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr ame->view())); 1843 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr ame->view()));
1842 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, 1844 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures,
1843 activeWindow, firstFrame, m_frame, function, functionContext); 1845 activeWindow, firstFrame, m_frame, function, functionContext);
1844 if (!dialogFrame) 1846 if (!dialogFrame)
1845 return; 1847 return;
1846 UserGestureIndicatorDisabler disabler; 1848 UserGestureIndicatorDisabler disabler;
1847 dialogFrame->page()->chrome().runModal(); 1849 dialogFrame->page()->chrome().runModal();
1848 } 1850 }
1849 1851
1850 DOMWindow* DOMWindow::anonymousIndexedGetter(uint32_t index) 1852 DOMWindow* DOMWindow::anonymousIndexedGetter(uint32_t index)
(...skipping 14 matching lines...) Expand all
1865 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext::lifecycleN otifier()); 1867 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext::lifecycleN otifier());
1866 } 1868 }
1867 1869
1868 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() 1870 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier()
1869 { 1871 {
1870 return DOMWindowLifecycleNotifier::create(this); 1872 return DOMWindowLifecycleNotifier::create(this);
1871 } 1873 }
1872 1874
1873 1875
1874 } // namespace WebCore 1876 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/mac/fast/dom/Window/open-window-min-size-expected.txt ('k') | Source/core/page/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698