| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 #include "core/page/PrintContext.h" | 149 #include "core/page/PrintContext.h" |
| 150 #include "core/paint/PaintLayer.h" | 150 #include "core/paint/PaintLayer.h" |
| 151 #include "core/paint/TransformRecorder.h" | 151 #include "core/paint/TransformRecorder.h" |
| 152 #include "core/style/StyleInheritedData.h" | 152 #include "core/style/StyleInheritedData.h" |
| 153 #include "core/timing/DOMWindowPerformance.h" | 153 #include "core/timing/DOMWindowPerformance.h" |
| 154 #include "core/timing/Performance.h" | 154 #include "core/timing/Performance.h" |
| 155 #include "modules/app_banner/AppBannerController.h" | 155 #include "modules/app_banner/AppBannerController.h" |
| 156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" | 156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" |
| 157 #include "modules/bluetooth/BluetoothSupplement.h" | 157 #include "modules/bluetooth/BluetoothSupplement.h" |
| 158 #include "modules/installedapp/InstalledAppController.h" | 158 #include "modules/installedapp/InstalledAppController.h" |
| 159 #include "modules/notifications/NotificationPermissionClient.h" | |
| 160 #include "modules/presentation/PresentationController.h" | 159 #include "modules/presentation/PresentationController.h" |
| 161 #include "modules/push_messaging/PushController.h" | 160 #include "modules/push_messaging/PushController.h" |
| 162 #include "modules/screen_orientation/ScreenOrientationController.h" | 161 #include "modules/screen_orientation/ScreenOrientationController.h" |
| 163 #include "modules/wake_lock/ScreenWakeLock.h" | 162 #include "modules/wake_lock/ScreenWakeLock.h" |
| 164 #include "platform/ScriptForbiddenScope.h" | 163 #include "platform/ScriptForbiddenScope.h" |
| 165 #include "platform/TraceEvent.h" | 164 #include "platform/TraceEvent.h" |
| 166 #include "platform/UserGestureIndicator.h" | 165 #include "platform/UserGestureIndicator.h" |
| 167 #include "platform/clipboard/ClipboardUtilities.h" | 166 #include "platform/clipboard/ClipboardUtilities.h" |
| 168 #include "platform/fonts/FontCache.h" | 167 #include "platform/fonts/FontCache.h" |
| 169 #include "platform/graphics/GraphicsContext.h" | 168 #include "platform/graphics/GraphicsContext.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 #include "public/web/WebSerializedScriptValue.h" | 213 #include "public/web/WebSerializedScriptValue.h" |
| 215 #include "public/web/WebTreeScopeType.h" | 214 #include "public/web/WebTreeScopeType.h" |
| 216 #include "skia/ext/platform_canvas.h" | 215 #include "skia/ext/platform_canvas.h" |
| 217 #include "web/AssociatedURLLoader.h" | 216 #include "web/AssociatedURLLoader.h" |
| 218 #include "web/AudioOutputDeviceClientImpl.h" | 217 #include "web/AudioOutputDeviceClientImpl.h" |
| 219 #include "web/CompositionUnderlineVectorBuilder.h" | 218 #include "web/CompositionUnderlineVectorBuilder.h" |
| 220 #include "web/FindInPageCoordinates.h" | 219 #include "web/FindInPageCoordinates.h" |
| 221 #include "web/IndexedDBClientImpl.h" | 220 #include "web/IndexedDBClientImpl.h" |
| 222 #include "web/LocalFileSystemClient.h" | 221 #include "web/LocalFileSystemClient.h" |
| 223 #include "web/NavigatorContentUtilsClientImpl.h" | 222 #include "web/NavigatorContentUtilsClientImpl.h" |
| 224 #include "web/NotificationPermissionClientImpl.h" | |
| 225 #include "web/RemoteFrameOwner.h" | 223 #include "web/RemoteFrameOwner.h" |
| 226 #include "web/SharedWorkerRepositoryClientImpl.h" | 224 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 227 #include "web/SuspendableScriptExecutor.h" | 225 #include "web/SuspendableScriptExecutor.h" |
| 228 #include "web/TextFinder.h" | 226 #include "web/TextFinder.h" |
| 229 #include "web/WebDataSourceImpl.h" | 227 #include "web/WebDataSourceImpl.h" |
| 230 #include "web/WebDevToolsAgentImpl.h" | 228 #include "web/WebDevToolsAgentImpl.h" |
| 231 #include "web/WebFrameWidgetImpl.h" | 229 #include "web/WebFrameWidgetImpl.h" |
| 232 #include "web/WebPluginContainerImpl.h" | 230 #include "web/WebPluginContainerImpl.h" |
| 233 #include "web/WebRemoteFrameImpl.h" | 231 #include "web/WebRemoteFrameImpl.h" |
| 234 #include "web/WebViewImpl.h" | 232 #include "web/WebViewImpl.h" |
| (...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 { | 1484 { |
| 1487 m_frame = frame; | 1485 m_frame = frame; |
| 1488 | 1486 |
| 1489 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. | 1487 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. |
| 1490 if (!m_frame) | 1488 if (!m_frame) |
| 1491 return; | 1489 return; |
| 1492 | 1490 |
| 1493 if (m_client) | 1491 if (m_client) |
| 1494 providePushControllerTo(*m_frame, m_client->pushClient()); | 1492 providePushControllerTo(*m_frame, m_client->pushClient()); |
| 1495 | 1493 |
| 1496 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient
Impl::create()); | |
| 1497 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1494 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
| 1498 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); | 1495 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); |
| 1499 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1496 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1500 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr
eate(this)); | 1497 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr
eate(this)); |
| 1501 | 1498 |
| 1502 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); | 1499 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); |
| 1503 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) | 1500 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) |
| 1504 enableWebBluetooth = true; | 1501 enableWebBluetooth = true; |
| 1505 #endif | 1502 #endif |
| 1506 if (enableWebBluetooth) | 1503 if (enableWebBluetooth) |
| (...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2237 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2241 } else if (metric == "wasAlternateProtocolAvailable") { | 2238 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2239 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2243 } else if (metric == "connectionInfo") { | 2240 } else if (metric == "connectionInfo") { |
| 2244 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2241 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2245 } | 2242 } |
| 2246 UseCounter::count(frame(), feature); | 2243 UseCounter::count(frame(), feature); |
| 2247 } | 2244 } |
| 2248 | 2245 |
| 2249 } // namespace blink | 2246 } // namespace blink |
| OLD | NEW |