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

Side by Side Diff: third_party/WebKit/WebCore/loader/DocumentLoader.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 , m_request(req) 145 , m_request(req)
146 , m_committed(false) 146 , m_committed(false)
147 , m_isStopping(false) 147 , m_isStopping(false)
148 , m_loading(false) 148 , m_loading(false)
149 , m_gotFirstByte(false) 149 , m_gotFirstByte(false)
150 , m_primaryLoadComplete(false) 150 , m_primaryLoadComplete(false)
151 , m_isClientRedirect(false) 151 , m_isClientRedirect(false)
152 , m_loadingFromCachedPage(false) 152 , m_loadingFromCachedPage(false)
153 , m_stopRecordingResponses(false) 153 , m_stopRecordingResponses(false)
154 , m_substituteResourceDeliveryTimer(this, &DocumentLoader::substituteResourc eDeliveryTimerFired) 154 , m_substituteResourceDeliveryTimer(this, &DocumentLoader::substituteResourc eDeliveryTimerFired)
155 , m_urlForHistoryReflectsClientRedirect(false)
155 #if ENABLE(OFFLINE_WEB_APPLICATIONS) 156 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
156 , m_candidateApplicationCacheGroup(0) 157 , m_candidateApplicationCacheGroup(0)
157 #endif 158 #endif
158 { 159 {
159 } 160 }
160 161
161 FrameLoader* DocumentLoader::frameLoader() const 162 FrameLoader* DocumentLoader::frameLoader() const
162 { 163 {
163 if (!m_frame) 164 if (!m_frame)
164 return 0; 165 return 0;
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 945
945 m_pendingSubstituteResources.set(loader, resource); 946 m_pendingSubstituteResources.set(loader, resource);
946 deliverSubstituteResourcesAfterDelay(); 947 deliverSubstituteResourcesAfterDelay();
947 948
948 return true; 949 return true;
949 } 950 }
950 951
951 #endif // ENABLE(OFFLINE_WEB_APPLICATIONS) 952 #endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
952 953
953 } 954 }
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/loader/DocumentLoader.h ('k') | third_party/WebKit/WebCore/loader/DocumentThreadableLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698