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

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

Issue 2628153002: PlzNavigate: Fix anchor-no-multiple-windows.html layout test. (Closed)
Patch Set: Update the shouldSendCompleteNotification() function to use the hasProvisionalNavigation() function Created 3 years, 11 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool shouldContinueForNavigationPolicy(const ResourceRequest&, 207 bool shouldContinueForNavigationPolicy(const ResourceRequest&,
208 const SubstituteData&, 208 const SubstituteData&,
209 DocumentLoader*, 209 DocumentLoader*,
210 ContentSecurityPolicyDisposition, 210 ContentSecurityPolicyDisposition,
211 NavigationType, 211 NavigationType,
212 NavigationPolicy, 212 NavigationPolicy,
213 bool shouldReplaceCurrentEntry, 213 bool shouldReplaceCurrentEntry,
214 bool isClientRedirect, 214 bool isClientRedirect,
215 HTMLFormElement*); 215 HTMLFormElement*);
216 216
217 // PlzNavigate: Navigations handled by the client are treated as
218 // provisional navigations.
219 bool hasProvisionalNavigation() const {
220 return provisionalDocumentLoader() || m_isNavigationHandledByClient;
221 }
222
217 DECLARE_TRACE(); 223 DECLARE_TRACE();
218 224
219 static void setReferrerForFrameRequest(FrameLoadRequest&); 225 static void setReferrerForFrameRequest(FrameLoadRequest&);
220 226
221 private: 227 private:
222 void checkTimerFired(TimerBase*); 228 void checkTimerFired(TimerBase*);
223 229
224 bool prepareRequestForThisFrame(FrameLoadRequest&); 230 bool prepareRequestForThisFrame(FrameLoadRequest&);
225 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 231 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
226 232
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 SandboxFlags m_forcedSandboxFlags; 322 SandboxFlags m_forcedSandboxFlags;
317 323
318 bool m_dispatchingDidClearWindowObjectInMainWorld; 324 bool m_dispatchingDidClearWindowObjectInMainWorld;
319 bool m_protectProvisionalLoader; 325 bool m_protectProvisionalLoader;
320 bool m_isNavigationHandledByClient; 326 bool m_isNavigationHandledByClient;
321 }; 327 };
322 328
323 } // namespace blink 329 } // namespace blink
324 330
325 #endif // FrameLoader_h 331 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698