| 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 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1628 DCHECK(m_client); | 1628 DCHECK(m_client); |
| 1629 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1629 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
| 1630 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1630 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
| 1631 ? WebTreeScopeType::Document | 1631 ? WebTreeScopeType::Document |
| 1632 : WebTreeScopeType::Shadow; | 1632 : WebTreeScopeType::Shadow; |
| 1633 WebFrameOwnerProperties ownerProperties( | 1633 WebFrameOwnerProperties ownerProperties( |
| 1634 ownerElement->browsingContextContainerName(), | 1634 ownerElement->browsingContextContainerName(), |
| 1635 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1635 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
| 1636 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1636 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
| 1637 ownerElement->allowPaymentRequest(), ownerElement->csp(), | 1637 ownerElement->allowPaymentRequest(), ownerElement->csp(), |
| 1638 ownerElement->delegatedPermissions(), ownerElement->allowedFeatures()); | 1638 ownerElement->allowedFeatures()); |
| 1639 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1639 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
| 1640 // solution. subResourceAttributeName returns just one attribute name. The | 1640 // solution. subResourceAttributeName returns just one attribute name. The |
| 1641 // element might not have the attribute, and there might be other attributes | 1641 // element might not have the attribute, and there might be other attributes |
| 1642 // which can identify the element. | 1642 // which can identify the element. |
| 1643 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1643 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
| 1644 name, | 1644 name, |
| 1645 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1645 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
| 1646 WebLocalFrameImpl* webframeChild = | 1646 WebLocalFrameImpl* webframeChild = |
| 1647 toWebLocalFrameImpl(m_client->createChildFrame( | 1647 toWebLocalFrameImpl(m_client->createChildFrame( |
| 1648 this, scope, name, uniqueName, | 1648 this, scope, name, uniqueName, |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2460 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2460 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2462 } else { | 2462 } else { |
| 2463 clipHtml = | 2463 clipHtml = |
| 2464 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2464 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2466 } | 2466 } |
| 2467 } | 2467 } |
| 2468 | 2468 |
| 2469 } // namespace blink | 2469 } // namespace blink |
| OLD | NEW |