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 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1608 DCHECK(m_client); | 1608 DCHECK(m_client); |
1609 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1609 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
1610 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1610 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
1611 ? WebTreeScopeType::Document | 1611 ? WebTreeScopeType::Document |
1612 : WebTreeScopeType::Shadow; | 1612 : WebTreeScopeType::Shadow; |
1613 WebFrameOwnerProperties ownerProperties( | 1613 WebFrameOwnerProperties ownerProperties( |
1614 ownerElement->browsingContextContainerName(), | 1614 ownerElement->browsingContextContainerName(), |
1615 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1615 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
1616 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1616 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
1617 ownerElement->allowPaymentRequest(), ownerElement->csp(), | 1617 ownerElement->allowPaymentRequest(), ownerElement->csp(), |
1618 ownerElement->delegatedPermissions()); | 1618 ownerElement->delegatedPermissions(), ownerElement->allowedFeatures()); |
1619 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1619 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
1620 // solution. subResourceAttributeName returns just one attribute name. The | 1620 // solution. subResourceAttributeName returns just one attribute name. The |
1621 // element might not have the attribute, and there might be other attributes | 1621 // element might not have the attribute, and there might be other attributes |
1622 // which can identify the element. | 1622 // which can identify the element. |
1623 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1623 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
1624 name, | 1624 name, |
1625 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1625 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
1626 WebLocalFrameImpl* webframeChild = | 1626 WebLocalFrameImpl* webframeChild = |
1627 toWebLocalFrameImpl(m_client->createChildFrame( | 1627 toWebLocalFrameImpl(m_client->createChildFrame( |
1628 this, scope, name, uniqueName, | 1628 this, scope, name, uniqueName, |
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2440 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2440 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2441 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2441 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2442 } else { | 2442 } else { |
2443 clipHtml = | 2443 clipHtml = |
2444 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2444 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2445 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2445 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2446 } | 2446 } |
2447 } | 2447 } |
2448 | 2448 |
2449 } // namespace blink | 2449 } // namespace blink |
OLD | NEW |