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

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

Issue 201773002: Do not trigger new history entry if iframe URL doesn't change (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix tests. Somehow getting different iframe dump on some bots. Created 6 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. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 116 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
117 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); } 117 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); }
118 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); } 118 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); }
119 FrameState state() const { return m_state; } 119 FrameState state() const { return m_state; }
120 FetchContext& fetchContext() const { return *m_fetchContext; } 120 FetchContext& fetchContext() const { return *m_fetchContext; }
121 121
122 void receivedMainResourceError(const ResourceError&); 122 void receivedMainResourceError(const ResourceError&);
123 123
124 bool isLoadingMainFrame() const; 124 bool isLoadingMainFrame() const;
125 125
126 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
126 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 127 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
127 128
128 FrameLoadType loadType() const; 129 FrameLoadType loadType() const;
129 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 130 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
130 131
131 void checkLoadComplete(DocumentLoader*); 132 void checkLoadComplete(DocumentLoader*);
132 void checkLoadComplete(); 133 void checkLoadComplete();
133 134
134 static void addHTTPOriginIfNeeded(ResourceRequest&, const AtomicString& orig in); 135 static void addHTTPOriginIfNeeded(ResourceRequest&, const AtomicString& orig in);
135 136
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 283
283 bool m_didAccessInitialDocument; 284 bool m_didAccessInitialDocument;
284 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 285 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
285 286
286 SandboxFlags m_forcedSandboxFlags; 287 SandboxFlags m_forcedSandboxFlags;
287 }; 288 };
288 289
289 } // namespace WebCore 290 } // namespace WebCore
290 291
291 #endif // FrameLoader_h 292 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/history/history-length-append-subframe-with-hash-expected.txt ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698