| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #include "public/web/WebScriptSource.h" | 216 #include "public/web/WebScriptSource.h" |
| 217 #include "public/web/WebSerializedScriptValue.h" | 217 #include "public/web/WebSerializedScriptValue.h" |
| 218 #include "public/web/WebTestInterfaceFactory.h" | 218 #include "public/web/WebTestInterfaceFactory.h" |
| 219 #include "public/web/WebTreeScopeType.h" | 219 #include "public/web/WebTreeScopeType.h" |
| 220 #include "skia/ext/platform_canvas.h" | 220 #include "skia/ext/platform_canvas.h" |
| 221 #include "web/AssociatedURLLoader.h" | 221 #include "web/AssociatedURLLoader.h" |
| 222 #include "web/AudioOutputDeviceClientImpl.h" | 222 #include "web/AudioOutputDeviceClientImpl.h" |
| 223 #include "web/CompositionUnderlineVectorBuilder.h" | 223 #include "web/CompositionUnderlineVectorBuilder.h" |
| 224 #include "web/FindInPageCoordinates.h" | 224 #include "web/FindInPageCoordinates.h" |
| 225 #include "web/GeolocationClientProxy.h" | 225 #include "web/GeolocationClientProxy.h" |
| 226 #include "web/IndexedDBClientImpl.h" | |
| 227 #include "web/LocalFileSystemClient.h" | 226 #include "web/LocalFileSystemClient.h" |
| 228 #include "web/MIDIClientProxy.h" | 227 #include "web/MIDIClientProxy.h" |
| 229 #include "web/NavigatorContentUtilsClientImpl.h" | 228 #include "web/NavigatorContentUtilsClientImpl.h" |
| 230 #include "web/NotificationPermissionClientImpl.h" | 229 #include "web/NotificationPermissionClientImpl.h" |
| 231 #include "web/RemoteFrameOwner.h" | 230 #include "web/RemoteFrameOwner.h" |
| 232 #include "web/SharedWorkerRepositoryClientImpl.h" | 231 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 233 #include "web/SuspendableScriptExecutor.h" | 232 #include "web/SuspendableScriptExecutor.h" |
| 234 #include "web/TextFinder.h" | 233 #include "web/TextFinder.h" |
| 235 #include "web/WebDataSourceImpl.h" | 234 #include "web/WebDataSourceImpl.h" |
| 236 #include "web/WebDevToolsAgentImpl.h" | 235 #include "web/WebDevToolsAgentImpl.h" |
| (...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1479 , m_autofillClient(0) | 1478 , m_autofillClient(0) |
| 1480 , m_contentSettingsClient(0) | 1479 , m_contentSettingsClient(0) |
| 1481 , m_inputEventsScaleFactorForEmulation(1) | 1480 , m_inputEventsScaleFactorForEmulation(1) |
| 1482 , m_userMediaClientImpl(this) | 1481 , m_userMediaClientImpl(this) |
| 1483 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) | 1482 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) |
| 1484 , m_webDevToolsFrontend(0) | 1483 , m_webDevToolsFrontend(0) |
| 1485 #if ENABLE(OILPAN) | 1484 #if ENABLE(OILPAN) |
| 1486 , m_selfKeepAlive(this) | 1485 , m_selfKeepAlive(this) |
| 1487 #endif | 1486 #endif |
| 1488 { | 1487 { |
| 1489 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create); | |
| 1490 frameCount++; | 1488 frameCount++; |
| 1491 } | 1489 } |
| 1492 | 1490 |
| 1493 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) | 1491 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) |
| 1494 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) | 1492 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) |
| 1495 { | 1493 { |
| 1496 } | 1494 } |
| 1497 | 1495 |
| 1498 WebLocalFrameImpl::~WebLocalFrameImpl() | 1496 WebLocalFrameImpl::~WebLocalFrameImpl() |
| 1499 { | 1497 { |
| (...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2189 return WebSandboxFlags::None; | 2187 return WebSandboxFlags::None; |
| 2190 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2188 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2191 } | 2189 } |
| 2192 | 2190 |
| 2193 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2191 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2194 { | 2192 { |
| 2195 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2193 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2196 } | 2194 } |
| 2197 | 2195 |
| 2198 } // namespace blink | 2196 } // namespace blink |
| OLD | NEW |