| OLD | NEW |
| 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 #include "public/platform/WebFloatPoint.h" | 181 #include "public/platform/WebFloatPoint.h" |
| 182 #include "public/platform/WebFloatRect.h" | 182 #include "public/platform/WebFloatRect.h" |
| 183 #include "public/platform/WebLayer.h" | 183 #include "public/platform/WebLayer.h" |
| 184 #include "public/platform/WebPoint.h" | 184 #include "public/platform/WebPoint.h" |
| 185 #include "public/platform/WebRect.h" | 185 #include "public/platform/WebRect.h" |
| 186 #include "public/platform/WebSecurityOrigin.h" | 186 #include "public/platform/WebSecurityOrigin.h" |
| 187 #include "public/platform/WebSize.h" | 187 #include "public/platform/WebSize.h" |
| 188 #include "public/platform/WebSuspendableTask.h" | 188 #include "public/platform/WebSuspendableTask.h" |
| 189 #include "public/platform/WebURLError.h" | 189 #include "public/platform/WebURLError.h" |
| 190 #include "public/platform/WebVector.h" | 190 #include "public/platform/WebVector.h" |
| 191 #include "public/web/WebAssociatedURLLoaderOptions.h" |
| 191 #include "public/web/WebAutofillClient.h" | 192 #include "public/web/WebAutofillClient.h" |
| 192 #include "public/web/WebConsoleMessage.h" | 193 #include "public/web/WebConsoleMessage.h" |
| 193 #include "public/web/WebDOMEvent.h" | 194 #include "public/web/WebDOMEvent.h" |
| 194 #include "public/web/WebDocument.h" | 195 #include "public/web/WebDocument.h" |
| 195 #include "public/web/WebFindOptions.h" | 196 #include "public/web/WebFindOptions.h" |
| 196 #include "public/web/WebFormElement.h" | 197 #include "public/web/WebFormElement.h" |
| 197 #include "public/web/WebFrameClient.h" | 198 #include "public/web/WebFrameClient.h" |
| 198 #include "public/web/WebFrameOwnerProperties.h" | 199 #include "public/web/WebFrameOwnerProperties.h" |
| 199 #include "public/web/WebHistoryItem.h" | 200 #include "public/web/WebHistoryItem.h" |
| 200 #include "public/web/WebIconURL.h" | 201 #include "public/web/WebIconURL.h" |
| 201 #include "public/web/WebInputElement.h" | 202 #include "public/web/WebInputElement.h" |
| 202 #include "public/web/WebKit.h" | 203 #include "public/web/WebKit.h" |
| 203 #include "public/web/WebNode.h" | 204 #include "public/web/WebNode.h" |
| 204 #include "public/web/WebPerformance.h" | 205 #include "public/web/WebPerformance.h" |
| 205 #include "public/web/WebPlugin.h" | 206 #include "public/web/WebPlugin.h" |
| 206 #include "public/web/WebPrintParams.h" | 207 #include "public/web/WebPrintParams.h" |
| 207 #include "public/web/WebPrintPresetOptions.h" | 208 #include "public/web/WebPrintPresetOptions.h" |
| 208 #include "public/web/WebRange.h" | 209 #include "public/web/WebRange.h" |
| 209 #include "public/web/WebScriptSource.h" | 210 #include "public/web/WebScriptSource.h" |
| 210 #include "public/web/WebSerializedScriptValue.h" | 211 #include "public/web/WebSerializedScriptValue.h" |
| 211 #include "public/web/WebTreeScopeType.h" | 212 #include "public/web/WebTreeScopeType.h" |
| 212 #include "skia/ext/platform_canvas.h" | 213 #include "skia/ext/platform_canvas.h" |
| 213 #include "web/AssociatedURLLoader.h" | |
| 214 #include "web/CompositionUnderlineVectorBuilder.h" | 214 #include "web/CompositionUnderlineVectorBuilder.h" |
| 215 #include "web/FindInPageCoordinates.h" | 215 #include "web/FindInPageCoordinates.h" |
| 216 #include "web/RemoteFrameOwner.h" | 216 #include "web/RemoteFrameOwner.h" |
| 217 #include "web/SharedWorkerRepositoryClientImpl.h" | 217 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 218 #include "web/SuspendableScriptExecutor.h" | 218 #include "web/SuspendableScriptExecutor.h" |
| 219 #include "web/TextFinder.h" | 219 #include "web/TextFinder.h" |
| 220 #include "web/WebAssociatedURLLoaderImpl.h" |
| 220 #include "web/WebDataSourceImpl.h" | 221 #include "web/WebDataSourceImpl.h" |
| 221 #include "web/WebDevToolsAgentImpl.h" | 222 #include "web/WebDevToolsAgentImpl.h" |
| 222 #include "web/WebFrameWidgetImpl.h" | 223 #include "web/WebFrameWidgetImpl.h" |
| 223 #include "web/WebPluginContainerImpl.h" | 224 #include "web/WebPluginContainerImpl.h" |
| 224 #include "web/WebRemoteFrameImpl.h" | 225 #include "web/WebRemoteFrameImpl.h" |
| 225 #include "web/WebViewImpl.h" | 226 #include "web/WebViewImpl.h" |
| 226 #include "wtf/CurrentTime.h" | 227 #include "wtf/CurrentTime.h" |
| 227 #include "wtf/HashMap.h" | 228 #include "wtf/HashMap.h" |
| 228 #include "wtf/PtrUtil.h" | 229 #include "wtf/PtrUtil.h" |
| 229 #include <algorithm> | 230 #include <algorithm> |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 945 request.toMutableResourceRequest().setHTTPReferrer( | 946 request.toMutableResourceRequest().setHTTPReferrer( |
| 946 SecurityPolicy::generateReferrer(frame()->document()->getReferrerPolicy(), | 947 SecurityPolicy::generateReferrer(frame()->document()->getReferrerPolicy(), |
| 947 request.url(), referrer)); | 948 request.url(), referrer)); |
| 948 } | 949 } |
| 949 | 950 |
| 950 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) { | 951 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) { |
| 951 frame()->loader().client()->dispatchWillSendRequest( | 952 frame()->loader().client()->dispatchWillSendRequest( |
| 952 request.toMutableResourceRequest()); | 953 request.toMutableResourceRequest()); |
| 953 } | 954 } |
| 954 | 955 |
| 955 WebURLLoader* WebLocalFrameImpl::createAssociatedURLLoader( | 956 WebAssociatedURLLoader* WebLocalFrameImpl::createAssociatedURLLoader( |
| 956 const WebURLLoaderOptions& options) { | 957 const WebAssociatedURLLoaderOptions& options) { |
| 957 return new AssociatedURLLoader(this, options); | 958 return new WebAssociatedURLLoaderImpl(this, options); |
| 958 } | 959 } |
| 959 | 960 |
| 960 unsigned WebLocalFrameImpl::unloadListenerCount() const { | 961 unsigned WebLocalFrameImpl::unloadListenerCount() const { |
| 961 return frame()->localDOMWindow()->pendingUnloadEventListeners(); | 962 return frame()->localDOMWindow()->pendingUnloadEventListeners(); |
| 962 } | 963 } |
| 963 | 964 |
| 964 void WebLocalFrameImpl::replaceSelection(const WebString& text) { | 965 void WebLocalFrameImpl::replaceSelection(const WebString& text) { |
| 965 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets | 966 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 966 // needs to be audited. See http://crbug.com/590369 for more details. | 967 // needs to be audited. See http://crbug.com/590369 for more details. |
| 967 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); | 968 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| (...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2340 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2341 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2341 } else if (metric == "wasAlternateProtocolAvailable") { | 2342 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2342 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2343 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2343 } else if (metric == "connectionInfo") { | 2344 } else if (metric == "connectionInfo") { |
| 2344 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2345 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2345 } | 2346 } |
| 2346 UseCounter::count(frame(), feature); | 2347 UseCounter::count(frame(), feature); |
| 2347 } | 2348 } |
| 2348 | 2349 |
| 2349 } // namespace blink | 2350 } // namespace blink |
| OLD | NEW |