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 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1514 } | 1514 } |
1515 | 1515 |
1516 LocalFrame* WebLocalFrameImpl::createChildFrame(const FrameLoadRequest& request, | 1516 LocalFrame* WebLocalFrameImpl::createChildFrame(const FrameLoadRequest& request, |
1517 const AtomicString& name, HTMLFrameOwnerElement* ownerElement) | 1517 const AtomicString& name, HTMLFrameOwnerElement* ownerElement) |
1518 { | 1518 { |
1519 DCHECK(m_client); | 1519 DCHECK(m_client); |
1520 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1520 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
1521 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1521 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
1522 ? WebTreeScopeType::Document | 1522 ? WebTreeScopeType::Document |
1523 : WebTreeScopeType::Shadow; | 1523 : WebTreeScopeType::Shadow; |
1524 WebFrameOwnerProperties ownerProperties(ownerElement->scrollingMode(), owner
Element->marginWidth(), ownerElement->marginHeight(), ownerElement->allowFullscr
een(), ownerElement->delegatedPermissions()); | 1524 WebFrameOwnerProperties ownerProperties(ownerElement->scrollingMode(), owner
Element->marginWidth(), ownerElement->marginHeight(), ownerElement->allowFullscr
een(), ownerElement->allowVR(), ownerElement->delegatedPermissions()); |
1525 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1525 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
1526 // solution. subResourceAttributeName returns just one attribute name. The | 1526 // solution. subResourceAttributeName returns just one attribute name. The |
1527 // element might not have the attribute, and there might be other attributes | 1527 // element might not have the attribute, and there might be other attributes |
1528 // which can identify the element. | 1528 // which can identify the element. |
1529 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFram
e( | 1529 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFram
e( |
1530 name, ownerElement->getAttribute(ownerElement->subResourceAttributeName(
))); | 1530 name, ownerElement->getAttribute(ownerElement->subResourceAttributeName(
))); |
1531 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild
Frame(this, scope, name, uniqueName, static_cast<WebSandboxFlags>(ownerElement->
getSandboxFlags()), ownerProperties)); | 1531 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild
Frame(this, scope, name, uniqueName, static_cast<WebSandboxFlags>(ownerElement->
getSandboxFlags()), ownerProperties)); |
1532 if (!webframeChild) | 1532 if (!webframeChild) |
1533 return nullptr; | 1533 return nullptr; |
1534 | 1534 |
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2235 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2235 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
2236 } else if (metric == "wasAlternateProtocolAvailable") { | 2236 } else if (metric == "wasAlternateProtocolAvailable") { |
2237 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2237 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
2238 } else if (metric == "connectionInfo") { | 2238 } else if (metric == "connectionInfo") { |
2239 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2239 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
2240 } | 2240 } |
2241 UseCounter::count(frame(), feature); | 2241 UseCounter::count(frame(), feature); |
2242 } | 2242 } |
2243 | 2243 |
2244 } // namespace blink | 2244 } // namespace blink |
OLD | NEW |