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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2399463007: AssociatedURLLoader shouldn't derive from WebURLLoader (Closed)
Patch Set: Rebase Created 4 years, 1 month 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #include "public/platform/WebFloatPoint.h" 182 #include "public/platform/WebFloatPoint.h"
183 #include "public/platform/WebFloatRect.h" 183 #include "public/platform/WebFloatRect.h"
184 #include "public/platform/WebLayer.h" 184 #include "public/platform/WebLayer.h"
185 #include "public/platform/WebPoint.h" 185 #include "public/platform/WebPoint.h"
186 #include "public/platform/WebRect.h" 186 #include "public/platform/WebRect.h"
187 #include "public/platform/WebSecurityOrigin.h" 187 #include "public/platform/WebSecurityOrigin.h"
188 #include "public/platform/WebSize.h" 188 #include "public/platform/WebSize.h"
189 #include "public/platform/WebSuspendableTask.h" 189 #include "public/platform/WebSuspendableTask.h"
190 #include "public/platform/WebURLError.h" 190 #include "public/platform/WebURLError.h"
191 #include "public/platform/WebVector.h" 191 #include "public/platform/WebVector.h"
192 #include "public/web/WebAssociatedURLLoaderOptions.h"
192 #include "public/web/WebAutofillClient.h" 193 #include "public/web/WebAutofillClient.h"
193 #include "public/web/WebConsoleMessage.h" 194 #include "public/web/WebConsoleMessage.h"
194 #include "public/web/WebDOMEvent.h" 195 #include "public/web/WebDOMEvent.h"
195 #include "public/web/WebDocument.h" 196 #include "public/web/WebDocument.h"
196 #include "public/web/WebFindOptions.h" 197 #include "public/web/WebFindOptions.h"
197 #include "public/web/WebFormElement.h" 198 #include "public/web/WebFormElement.h"
198 #include "public/web/WebFrameClient.h" 199 #include "public/web/WebFrameClient.h"
199 #include "public/web/WebFrameOwnerProperties.h" 200 #include "public/web/WebFrameOwnerProperties.h"
200 #include "public/web/WebHistoryItem.h" 201 #include "public/web/WebHistoryItem.h"
201 #include "public/web/WebIconURL.h" 202 #include "public/web/WebIconURL.h"
202 #include "public/web/WebInputElement.h" 203 #include "public/web/WebInputElement.h"
203 #include "public/web/WebKit.h" 204 #include "public/web/WebKit.h"
204 #include "public/web/WebNode.h" 205 #include "public/web/WebNode.h"
205 #include "public/web/WebPerformance.h" 206 #include "public/web/WebPerformance.h"
206 #include "public/web/WebPlugin.h" 207 #include "public/web/WebPlugin.h"
207 #include "public/web/WebPrintParams.h" 208 #include "public/web/WebPrintParams.h"
208 #include "public/web/WebPrintPresetOptions.h" 209 #include "public/web/WebPrintPresetOptions.h"
209 #include "public/web/WebRange.h" 210 #include "public/web/WebRange.h"
210 #include "public/web/WebScriptSource.h" 211 #include "public/web/WebScriptSource.h"
211 #include "public/web/WebSerializedScriptValue.h" 212 #include "public/web/WebSerializedScriptValue.h"
212 #include "public/web/WebTreeScopeType.h" 213 #include "public/web/WebTreeScopeType.h"
213 #include "skia/ext/platform_canvas.h" 214 #include "skia/ext/platform_canvas.h"
214 #include "web/AssociatedURLLoader.h"
215 #include "web/CompositionUnderlineVectorBuilder.h" 215 #include "web/CompositionUnderlineVectorBuilder.h"
216 #include "web/FindInPageCoordinates.h" 216 #include "web/FindInPageCoordinates.h"
217 #include "web/RemoteFrameOwner.h" 217 #include "web/RemoteFrameOwner.h"
218 #include "web/SharedWorkerRepositoryClientImpl.h" 218 #include "web/SharedWorkerRepositoryClientImpl.h"
219 #include "web/SuspendableScriptExecutor.h" 219 #include "web/SuspendableScriptExecutor.h"
220 #include "web/TextFinder.h" 220 #include "web/TextFinder.h"
221 #include "web/WebAssociatedURLLoaderImpl.h"
221 #include "web/WebDataSourceImpl.h" 222 #include "web/WebDataSourceImpl.h"
222 #include "web/WebDevToolsAgentImpl.h" 223 #include "web/WebDevToolsAgentImpl.h"
223 #include "web/WebFrameWidgetImpl.h" 224 #include "web/WebFrameWidgetImpl.h"
224 #include "web/WebPluginContainerImpl.h" 225 #include "web/WebPluginContainerImpl.h"
225 #include "web/WebRemoteFrameImpl.h" 226 #include "web/WebRemoteFrameImpl.h"
226 #include "web/WebViewImpl.h" 227 #include "web/WebViewImpl.h"
227 #include "wtf/CurrentTime.h" 228 #include "wtf/CurrentTime.h"
228 #include "wtf/HashMap.h" 229 #include "wtf/HashMap.h"
229 #include "wtf/PtrUtil.h" 230 #include "wtf/PtrUtil.h"
230 #include <algorithm> 231 #include <algorithm>
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 request.toMutableResourceRequest().setHTTPReferrer( 949 request.toMutableResourceRequest().setHTTPReferrer(
949 SecurityPolicy::generateReferrer(frame()->document()->getReferrerPolicy(), 950 SecurityPolicy::generateReferrer(frame()->document()->getReferrerPolicy(),
950 request.url(), referrer)); 951 request.url(), referrer));
951 } 952 }
952 953
953 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) { 954 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) {
954 frame()->loader().client()->dispatchWillSendRequest( 955 frame()->loader().client()->dispatchWillSendRequest(
955 request.toMutableResourceRequest()); 956 request.toMutableResourceRequest());
956 } 957 }
957 958
958 WebURLLoader* WebLocalFrameImpl::createAssociatedURLLoader( 959 WebAssociatedURLLoader* WebLocalFrameImpl::createAssociatedURLLoader(
959 const WebURLLoaderOptions& options) { 960 const WebAssociatedURLLoaderOptions& options) {
960 return new AssociatedURLLoader(this, options); 961 return new WebAssociatedURLLoaderImpl(this, options);
961 } 962 }
962 963
963 unsigned WebLocalFrameImpl::unloadListenerCount() const { 964 unsigned WebLocalFrameImpl::unloadListenerCount() const {
964 return frame()->localDOMWindow()->pendingUnloadEventListeners(); 965 return frame()->localDOMWindow()->pendingUnloadEventListeners();
965 } 966 }
966 967
967 void WebLocalFrameImpl::replaceSelection(const WebString& text) { 968 void WebLocalFrameImpl::replaceSelection(const WebString& text) {
968 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets 969 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
969 // needs to be audited. See http://crbug.com/590369 for more details. 970 // needs to be audited. See http://crbug.com/590369 for more details.
970 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); 971 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
2385 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; 2386 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
2386 } else if (metric == "wasAlternateProtocolAvailable") { 2387 } else if (metric == "wasAlternateProtocolAvailable") {
2387 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; 2388 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
2388 } else if (metric == "connectionInfo") { 2389 } else if (metric == "connectionInfo") {
2389 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2390 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2390 } 2391 }
2391 UseCounter::count(frame(), feature); 2392 UseCounter::count(frame(), feature);
2392 } 2393 }
2393 2394
2394 } // namespace blink 2395 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/WebRemoteFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698