OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
7 * | 7 * |
8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
10 * are met: | 10 * are met: |
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1291 Frame* targetFrame = sourceFrame->loader()->findFrameForNavigation(request.f
rameName()); | 1291 Frame* targetFrame = sourceFrame->loader()->findFrameForNavigation(request.f
rameName()); |
1292 if (targetFrame && targetFrame != sourceFrame) { | 1292 if (targetFrame && targetFrame != sourceFrame) { |
1293 if (Page* page = targetFrame->page()) | 1293 if (Page* page = targetFrame->page()) |
1294 page->chrome()->focus(); | 1294 page->chrome()->focus(); |
1295 } | 1295 } |
1296 } | 1296 } |
1297 | 1297 |
1298 void FrameLoader::loadURL(const KURL& newURL, const String& referrer, const Stri
ng& frameName, bool lockHistory, FrameLoadType newLoadType, | 1298 void FrameLoader::loadURL(const KURL& newURL, const String& referrer, const Stri
ng& frameName, bool lockHistory, FrameLoadType newLoadType, |
1299 PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState) | 1299 PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState) |
1300 { | 1300 { |
| 1301 if (m_inStopAllLoaders) |
| 1302 return; |
| 1303 |
1301 RefPtr<FormState> formState = prpFormState; | 1304 RefPtr<FormState> formState = prpFormState; |
1302 bool isFormSubmission = formState; | 1305 bool isFormSubmission = formState; |
1303 | 1306 |
1304 ResourceRequest request(newURL); | 1307 ResourceRequest request(newURL); |
1305 if (!referrer.isEmpty()) { | 1308 if (!referrer.isEmpty()) { |
1306 request.setHTTPReferrer(referrer); | 1309 request.setHTTPReferrer(referrer); |
1307 RefPtr<SecurityOrigin> referrerOrigin = SecurityOrigin::createFromString
(referrer); | 1310 RefPtr<SecurityOrigin> referrerOrigin = SecurityOrigin::createFromString
(referrer); |
1308 addHTTPOriginIfNeeded(request, referrerOrigin->toString()); | 1311 addHTTPOriginIfNeeded(request, referrerOrigin->toString()); |
1309 } | 1312 } |
1310 addExtraFieldsToRequest(request, newLoadType, true, event || isFormSubmissio
n); | 1313 addExtraFieldsToRequest(request, newLoadType, true, event || isFormSubmissio
n); |
(...skipping 2217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3528 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); | 3531 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); |
3529 page->chrome()->setWindowRect(windowRect); | 3532 page->chrome()->setWindowRect(windowRect); |
3530 | 3533 |
3531 page->chrome()->show(); | 3534 page->chrome()->show(); |
3532 | 3535 |
3533 created = true; | 3536 created = true; |
3534 return frame; | 3537 return frame; |
3535 } | 3538 } |
3536 | 3539 |
3537 } // namespace WebCore | 3540 } // namespace WebCore |
OLD | NEW |