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

Side by Side Diff: Source/WebCore/loader/FrameLoader.cpp

Issue 7390020: Merge 90936 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 5 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/fast/events/form-iframe-target-before-load-crash2-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, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
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 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 1330
1331 return urlString.startsWith("feed://", false) 1331 return urlString.startsWith("feed://", false)
1332 || urlString.startsWith("feed:http:", false) || urlString.startsWith("fe ed:https:", false) 1332 || urlString.startsWith("feed:http:", false) || urlString.startsWith("fe ed:https:", false)
1333 || urlString.startsWith("feeds:http:", false) || urlString.startsWith("f eeds:https:", false) 1333 || urlString.startsWith("feeds:http:", false) || urlString.startsWith("f eeds:https:", false)
1334 || urlString.startsWith("feedsearch:http:", false) || urlString.startsWi th("feedsearch:https:", false); 1334 || urlString.startsWith("feedsearch:http:", false) || urlString.startsWi th("feedsearch:https:", false);
1335 } 1335 }
1336 1336
1337 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHis tory, bool lockBackForwardList, 1337 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHis tory, bool lockBackForwardList,
1338 PassRefPtr<Event> event, PassRefPtr<FormState> formState, ReferrerPolicy ref errerPolicy) 1338 PassRefPtr<Event> event, PassRefPtr<FormState> formState, ReferrerPolicy ref errerPolicy)
1339 { 1339 {
1340 // Protect frame from getting blown away inside dispatchBeforeLoadEvent in l oadWithDocumentLoader.
1341 RefPtr<Frame> protect(m_frame);
1342
1340 KURL url = request.resourceRequest().url(); 1343 KURL url = request.resourceRequest().url();
1341 1344
1342 ASSERT(m_frame->document()); 1345 ASSERT(m_frame->document());
1343 // FIXME: Should we move the isFeedWithNestedProtocolInHTTPFamily logic insi de SecurityOrigin::canDisplay? 1346 // FIXME: Should we move the isFeedWithNestedProtocolInHTTPFamily logic insi de SecurityOrigin::canDisplay?
1344 if (!isFeedWithNestedProtocolInHTTPFamily(url) && !request.requester()->canD isplay(url)) { 1347 if (!isFeedWithNestedProtocolInHTTPFamily(url) && !request.requester()->canD isplay(url)) {
1345 reportLocalLoadFailed(m_frame, url.string()); 1348 reportLocalLoadFailed(m_frame, url.string());
1346 return; 1349 return;
1347 } 1350 }
1348 1351
1349 String referrer; 1352 String referrer;
(...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3611 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight())); 3614 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h eight()));
3612 page->chrome()->setWindowRect(windowRect); 3615 page->chrome()->setWindowRect(windowRect);
3613 3616
3614 page->chrome()->show(); 3617 page->chrome()->show();
3615 3618
3616 created = true; 3619 created = true;
3617 return frame; 3620 return frame;
3618 } 3621 }
3619 3622
3620 } // namespace WebCore 3623 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/events/form-iframe-target-before-load-crash2-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698