| 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 const AtomicString& name, | 1608 const AtomicString& name, |
| 1609 HTMLFrameOwnerElement* ownerElement) { | 1609 HTMLFrameOwnerElement* ownerElement) { |
| 1610 DCHECK(m_client); | 1610 DCHECK(m_client); |
| 1611 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1611 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
| 1612 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1612 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
| 1613 ? WebTreeScopeType::Document | 1613 ? WebTreeScopeType::Document |
| 1614 : WebTreeScopeType::Shadow; | 1614 : WebTreeScopeType::Shadow; |
| 1615 WebFrameOwnerProperties ownerProperties( | 1615 WebFrameOwnerProperties ownerProperties( |
| 1616 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1616 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
| 1617 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1617 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
| 1618 ownerElement->csp(), ownerElement->delegatedPermissions()); | 1618 ownerElement->allowPaymentRequest(), ownerElement->csp(), |
| 1619 ownerElement->delegatedPermissions()); |
| 1619 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1620 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
| 1620 // solution. subResourceAttributeName returns just one attribute name. The | 1621 // solution. subResourceAttributeName returns just one attribute name. The |
| 1621 // element might not have the attribute, and there might be other attributes | 1622 // element might not have the attribute, and there might be other attributes |
| 1622 // which can identify the element. | 1623 // which can identify the element. |
| 1623 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1624 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
| 1624 name, | 1625 name, |
| 1625 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1626 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
| 1626 WebLocalFrameImpl* webframeChild = | 1627 WebLocalFrameImpl* webframeChild = |
| 1627 toWebLocalFrameImpl(m_client->createChildFrame( | 1628 toWebLocalFrameImpl(m_client->createChildFrame( |
| 1628 this, scope, name, uniqueName, | 1629 this, scope, name, uniqueName, |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2378 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2379 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2379 } | 2380 } |
| 2380 UseCounter::count(frame(), feature); | 2381 UseCounter::count(frame(), feature); |
| 2381 } | 2382 } |
| 2382 | 2383 |
| 2383 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2384 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2384 return m_inputMethodController.get(); | 2385 return m_inputMethodController.get(); |
| 2385 } | 2386 } |
| 2386 | 2387 |
| 2387 } // namespace blink | 2388 } // namespace blink |
| OLD | NEW |