| OLD | NEW |
| 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 217 // PlzNavigate: Navigations handled by the client are treated as |
| 218 // provisional navigations. | 218 // provisional navigations. |
| 219 bool hasProvisionalNavigation() const { | 219 bool hasProvisionalNavigation() const { |
| 220 return provisionalDocumentLoader() || m_isNavigationHandledByClient; | 220 return provisionalDocumentLoader() || m_isNavigationHandledByClient; |
| 221 } | 221 } |
| 222 | 222 |
| 223 void clearNavigationHandledByClient() { |
| 224 m_isNavigationHandledByClient = false; |
| 225 } |
| 226 |
| 223 DECLARE_TRACE(); | 227 DECLARE_TRACE(); |
| 224 | 228 |
| 225 static void setReferrerForFrameRequest(FrameLoadRequest&); | 229 static void setReferrerForFrameRequest(FrameLoadRequest&); |
| 226 | 230 |
| 227 private: | 231 private: |
| 228 void checkTimerFired(TimerBase*); | 232 void checkTimerFired(TimerBase*); |
| 229 | 233 |
| 230 bool prepareRequestForThisFrame(FrameLoadRequest&); | 234 bool prepareRequestForThisFrame(FrameLoadRequest&); |
| 231 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); | 235 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); |
| 232 | 236 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 SandboxFlags m_forcedSandboxFlags; | 326 SandboxFlags m_forcedSandboxFlags; |
| 323 | 327 |
| 324 bool m_dispatchingDidClearWindowObjectInMainWorld; | 328 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 325 bool m_protectProvisionalLoader; | 329 bool m_protectProvisionalLoader; |
| 326 bool m_isNavigationHandledByClient; | 330 bool m_isNavigationHandledByClient; |
| 327 }; | 331 }; |
| 328 | 332 |
| 329 } // namespace blink | 333 } // namespace blink |
| 330 | 334 |
| 331 #endif // FrameLoader_h | 335 #endif // FrameLoader_h |
| OLD | NEW |