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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.h

Issue 2768813002: PlzNavigate: don't stop all loaders when renderer-initiated nav fails
Patch Set: Removed id Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 215
216 // Note: When a PlzNavigtate navigation is handled by the client, we will 216 // Note: When a PlzNavigtate navigation is handled by the client, we will
217 // have created a dummy provisional DocumentLoader, so this will return true 217 // have created a dummy provisional DocumentLoader, so this will return true
218 // while the client handles the navigation. 218 // while the client handles the navigation.
219 bool hasProvisionalNavigation() const { return provisionalDocumentLoader(); } 219 bool hasProvisionalNavigation() const { return provisionalDocumentLoader(); }
220 220
221 DECLARE_TRACE(); 221 DECLARE_TRACE();
222 222
223 static void setReferrerForFrameRequest(FrameLoadRequest&); 223 static void setReferrerForFrameRequest(FrameLoadRequest&);
224 224
225 void clientDroppedNavigation();
226
225 private: 227 private:
226 void checkTimerFired(TimerBase*); 228 void checkTimerFired(TimerBase*);
227 229
228 bool prepareRequestForThisFrame(FrameLoadRequest&); 230 bool prepareRequestForThisFrame(FrameLoadRequest&);
229 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 231 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
230 232
231 SubstituteData defaultSubstituteDataForURL(const KURL&); 233 SubstituteData defaultSubstituteDataForURL(const KURL&);
232 234
233 bool shouldPerformFragmentNavigation(bool isFormSubmission, 235 bool shouldPerformFragmentNavigation(bool isFormSubmission,
234 const String& httpMethod, 236 const String& httpMethod,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 329
328 SandboxFlags m_forcedSandboxFlags; 330 SandboxFlags m_forcedSandboxFlags;
329 331
330 bool m_dispatchingDidClearWindowObjectInMainWorld; 332 bool m_dispatchingDidClearWindowObjectInMainWorld;
331 bool m_protectProvisionalLoader; 333 bool m_protectProvisionalLoader;
332 }; 334 };
333 335
334 } // namespace blink 336 } // namespace blink
335 337
336 #endif // FrameLoader_h 338 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698