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

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

Issue 2815053002: Rewrite references to "wtf/" to "platform/wtf/" in core/loader. (Closed)
Patch Set: Created 3 years, 8 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, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "platform/UserGestureIndicator.h" 87 #include "platform/UserGestureIndicator.h"
88 #include "platform/instrumentation/tracing/TraceEvent.h" 88 #include "platform/instrumentation/tracing/TraceEvent.h"
89 #include "platform/loader/fetch/ResourceFetcher.h" 89 #include "platform/loader/fetch/ResourceFetcher.h"
90 #include "platform/loader/fetch/ResourceRequest.h" 90 #include "platform/loader/fetch/ResourceRequest.h"
91 #include "platform/network/HTTPParsers.h" 91 #include "platform/network/HTTPParsers.h"
92 #include "platform/scroll/ScrollAnimatorBase.h" 92 #include "platform/scroll/ScrollAnimatorBase.h"
93 #include "platform/weborigin/SchemeRegistry.h" 93 #include "platform/weborigin/SchemeRegistry.h"
94 #include "platform/weborigin/SecurityOrigin.h" 94 #include "platform/weborigin/SecurityOrigin.h"
95 #include "platform/weborigin/SecurityPolicy.h" 95 #include "platform/weborigin/SecurityPolicy.h"
96 #include "platform/weborigin/Suborigin.h" 96 #include "platform/weborigin/Suborigin.h"
97 #include "platform/wtf/AutoReset.h"
98 #include "platform/wtf/text/CString.h"
99 #include "platform/wtf/text/WTFString.h"
97 #include "public/platform/WebCachePolicy.h" 100 #include "public/platform/WebCachePolicy.h"
98 #include "public/platform/WebURLRequest.h" 101 #include "public/platform/WebURLRequest.h"
99 #include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider. h" 102 #include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider. h"
100 #include "wtf/AutoReset.h"
101 #include "wtf/text/CString.h"
102 #include "wtf/text/WTFString.h"
103 103
104 using blink::WebURLRequest; 104 using blink::WebURLRequest;
105 105
106 namespace blink { 106 namespace blink {
107 107
108 using namespace HTMLNames; 108 using namespace HTMLNames;
109 109
110 bool IsBackForwardLoadType(FrameLoadType type) { 110 bool IsBackForwardLoadType(FrameLoadType type) {
111 return type == kFrameLoadTypeBackForward || 111 return type == kFrameLoadTypeBackForward ||
112 type == kFrameLoadTypeInitialHistoryLoad; 112 type == kFrameLoadTypeInitialHistoryLoad;
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 // TODO(japhet): This is needed because the browser process DCHECKs if the 1774 // TODO(japhet): This is needed because the browser process DCHECKs if the
1775 // first entry we commit in a new frame has replacement set. It's unclear 1775 // first entry we commit in a new frame has replacement set. It's unclear
1776 // whether the DCHECK is right, investigate removing this special case. 1776 // whether the DCHECK is right, investigate removing this special case.
1777 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && 1777 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
1778 (!Opener() || !request.Url().IsEmpty()); 1778 (!Opener() || !request.Url().IsEmpty());
1779 loader->SetReplacesCurrentHistoryItem(replace_current_item); 1779 loader->SetReplacesCurrentHistoryItem(replace_current_item);
1780 return loader; 1780 return loader;
1781 } 1781 }
1782 1782
1783 } // namespace blink 1783 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.h ('k') | third_party/WebKit/Source/core/loader/FrameLoaderStateMachine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698