| OLD | NEW |
| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "DOMWindow.h" | 28 #include "DOMWindow.h" |
| 29 | 29 |
| 30 #include <algorithm> |
| 30 #include "BackForwardController.h" | 31 #include "BackForwardController.h" |
| 31 #include "BarInfo.h" | 32 #include "BarInfo.h" |
| 32 #include "BeforeUnloadEvent.h" | 33 #include "BeforeUnloadEvent.h" |
| 33 #include "CSSComputedStyleDeclaration.h" | 34 #include "CSSComputedStyleDeclaration.h" |
| 34 #include "CSSRuleList.h" | 35 #include "CSSRuleList.h" |
| 35 #include "Chrome.h" | 36 #include "Chrome.h" |
| 36 #include "ChromeClient.h" | 37 #include "ChromeClient.h" |
| 37 #include "Console.h" | 38 #include "Console.h" |
| 38 #include "Crypto.h" | 39 #include "Crypto.h" |
| 39 #include "DOMApplicationCache.h" | 40 #include "DOMApplicationCache.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 #include "RuntimeEnabledFeatures.h" | 86 #include "RuntimeEnabledFeatures.h" |
| 86 #include "ScheduledAction.h" | 87 #include "ScheduledAction.h" |
| 87 #include "Screen.h" | 88 #include "Screen.h" |
| 88 #include "ScriptCallStack.h" | 89 #include "ScriptCallStack.h" |
| 89 #include "ScriptCallStackFactory.h" | 90 #include "ScriptCallStackFactory.h" |
| 90 #include "ScriptController.h" | 91 #include "ScriptController.h" |
| 91 #include "SecurityOrigin.h" | 92 #include "SecurityOrigin.h" |
| 92 #include "SecurityPolicy.h" | 93 #include "SecurityPolicy.h" |
| 93 #include "SerializedScriptValue.h" | 94 #include "SerializedScriptValue.h" |
| 94 #include "Settings.h" | 95 #include "Settings.h" |
| 95 #include "Storage.h" | |
| 96 #include "StorageArea.h" | |
| 97 #include "StorageNamespace.h" | |
| 98 #include "StyleMedia.h" | 96 #include "StyleMedia.h" |
| 99 #include "StyleResolver.h" | 97 #include "StyleResolver.h" |
| 100 #include "SuddenTermination.h" | 98 #include "SuddenTermination.h" |
| 101 #include "WindowFeatures.h" | 99 #include "WindowFeatures.h" |
| 102 #include "WindowFocusAllowedIndicator.h" | 100 #include "WindowFocusAllowedIndicator.h" |
| 103 #include <algorithm> | 101 #include "core/storage/Storage.h" |
| 102 #include "core/storage/StorageArea.h" |
| 103 #include "core/storage/StorageNamespace.h" |
| 104 #include <wtf/CurrentTime.h> | 104 #include <wtf/CurrentTime.h> |
| 105 #include <wtf/MainThread.h> | 105 #include <wtf/MainThread.h> |
| 106 #include <wtf/MathExtras.h> | 106 #include <wtf/MathExtras.h> |
| 107 #include <wtf/text/Base64.h> | 107 #include <wtf/text/Base64.h> |
| 108 #include <wtf/text/WTFString.h> | 108 #include <wtf/text/WTFString.h> |
| 109 | 109 |
| 110 using std::min; | 110 using std::min; |
| 111 using std::max; | 111 using std::max; |
| 112 | 112 |
| 113 namespace WebCore { | 113 namespace WebCore { |
| (...skipping 1771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1885 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr
ame->view())); | 1885 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr
ame->view())); |
| 1886 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, | 1886 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, |
| 1887 activeWindow, firstFrame, m_frame, function, functionContext); | 1887 activeWindow, firstFrame, m_frame, function, functionContext); |
| 1888 if (!dialogFrame) | 1888 if (!dialogFrame) |
| 1889 return; | 1889 return; |
| 1890 UserGestureIndicatorDisabler disabler; | 1890 UserGestureIndicatorDisabler disabler; |
| 1891 dialogFrame->page()->chrome()->runModal(); | 1891 dialogFrame->page()->chrome()->runModal(); |
| 1892 } | 1892 } |
| 1893 | 1893 |
| 1894 } // namespace WebCore | 1894 } // namespace WebCore |
| OLD | NEW |