| 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 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1582 const AtomicString& name, | 1582 const AtomicString& name, |
| 1583 HTMLFrameOwnerElement* ownerElement) { | 1583 HTMLFrameOwnerElement* ownerElement) { |
| 1584 DCHECK(m_client); | 1584 DCHECK(m_client); |
| 1585 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1585 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
| 1586 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1586 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
| 1587 ? WebTreeScopeType::Document | 1587 ? WebTreeScopeType::Document |
| 1588 : WebTreeScopeType::Shadow; | 1588 : WebTreeScopeType::Shadow; |
| 1589 WebFrameOwnerProperties ownerProperties( | 1589 WebFrameOwnerProperties ownerProperties( |
| 1590 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1590 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
| 1591 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1591 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
| 1592 ownerElement->allowPaymentRequest(), |
| 1592 ownerElement->delegatedPermissions()); | 1593 ownerElement->delegatedPermissions()); |
| 1593 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1594 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
| 1594 // solution. subResourceAttributeName returns just one attribute name. The | 1595 // solution. subResourceAttributeName returns just one attribute name. The |
| 1595 // element might not have the attribute, and there might be other attributes | 1596 // element might not have the attribute, and there might be other attributes |
| 1596 // which can identify the element. | 1597 // which can identify the element. |
| 1597 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1598 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
| 1598 name, | 1599 name, |
| 1599 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1600 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
| 1600 WebLocalFrameImpl* webframeChild = | 1601 WebLocalFrameImpl* webframeChild = |
| 1601 toWebLocalFrameImpl(m_client->createChildFrame( | 1602 toWebLocalFrameImpl(m_client->createChildFrame( |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2328 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2329 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2329 } else if (metric == "wasAlternateProtocolAvailable") { | 2330 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2330 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2331 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2331 } else if (metric == "connectionInfo") { | 2332 } else if (metric == "connectionInfo") { |
| 2332 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2333 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2333 } | 2334 } |
| 2334 UseCounter::count(frame(), feature); | 2335 UseCounter::count(frame(), feature); |
| 2335 } | 2336 } |
| 2336 | 2337 |
| 2337 } // namespace blink | 2338 } // namespace blink |
| OLD | NEW |