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

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

Issue 12090050: Revert 138962 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1397/
Patch Set: Created 7 years, 10 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 | « Source/WebCore/html/HTMLAnchorElement.cpp ('k') | Source/WebCore/loader/FrameLoader.h » ('j') | 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 timing()->markNavigationStart(); 887 timing()->markNavigationStart();
888 ASSERT(!m_mainResourceLoader); 888 ASSERT(!m_mainResourceLoader);
889 889
890 if (maybeLoadEmpty()) 890 if (maybeLoadEmpty())
891 return; 891 return;
892 892
893 m_mainResourceLoader = MainResourceLoader::create(this); 893 m_mainResourceLoader = MainResourceLoader::create(this);
894 894
895 // FIXME: Is there any way the extra fields could have not been added by now ? 895 // FIXME: Is there any way the extra fields could have not been added by now ?
896 // If not, it would be great to remove this line of code. 896 // If not, it would be great to remove this line of code.
897 // Note that currently, some requests may have incorrect extra fields even i f this function has been called,
898 // because we pass a wrong loadType (see FIXME in addExtraFieldsToMainResour ceRequest()).
899 frameLoader()->addExtraFieldsToMainResourceRequest(m_request); 897 frameLoader()->addExtraFieldsToMainResourceRequest(m_request);
900 m_mainResourceLoader->load(m_request, m_substituteData); 898 m_mainResourceLoader->load(m_request, m_substituteData);
901 899
902 if (m_request.isNull()) { 900 if (m_request.isNull()) {
903 m_mainResourceLoader = 0; 901 m_mainResourceLoader = 0;
904 // If the load was aborted by clearing m_request, it's possible the Appl icationCacheHost 902 // If the load was aborted by clearing m_request, it's possible the Appl icationCacheHost
905 // is now in a state where starting an empty load will be inconsistent. Replace it with 903 // is now in a state where starting an empty load will be inconsistent. Replace it with
906 // a new ApplicationCacheHost. 904 // a new ApplicationCacheHost.
907 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this)); 905 m_applicationCacheHost = adoptPtr(new ApplicationCacheHost(this));
908 maybeLoadEmpty(); 906 maybeLoadEmpty();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 iconDatabase().iconDataForIconURL(urlString, m_iconDataCallback); 972 iconDatabase().iconDataForIconURL(urlString, m_iconDataCallback);
975 } 973 }
976 974
977 void DocumentLoader::handledOnloadEvents() 975 void DocumentLoader::handledOnloadEvents()
978 { 976 {
979 m_wasOnloadHandled = true; 977 m_wasOnloadHandled = true;
980 applicationCacheHost()->stopDeferringEvents(); 978 applicationCacheHost()->stopDeferringEvents();
981 } 979 }
982 980
983 } // namespace WebCore 981 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLAnchorElement.cpp ('k') | Source/WebCore/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698