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 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1619 const AtomicString& name, | 1619 const AtomicString& name, |
1620 HTMLFrameOwnerElement* ownerElement) { | 1620 HTMLFrameOwnerElement* ownerElement) { |
1621 DCHECK(m_client); | 1621 DCHECK(m_client); |
1622 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1622 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
1623 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1623 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
1624 ? WebTreeScopeType::Document | 1624 ? WebTreeScopeType::Document |
1625 : WebTreeScopeType::Shadow; | 1625 : WebTreeScopeType::Shadow; |
1626 WebFrameOwnerProperties ownerProperties( | 1626 WebFrameOwnerProperties ownerProperties( |
1627 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1627 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
1628 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1628 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
1629 ownerElement->csp(), ownerElement->delegatedPermissions()); | 1629 ownerElement->allowFullscreen(), ownerElement->csp(), |
please use gerrit instead
2016/10/17 13:57:48
You seem to have passed in "allowFullscreen()" twi
pals
2016/10/18 04:39:21
Its a mistake. Messed up during rebase from patch
| |
1630 ownerElement->delegatedPermissions()); | |
1630 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1631 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
1631 // solution. subResourceAttributeName returns just one attribute name. The | 1632 // solution. subResourceAttributeName returns just one attribute name. The |
1632 // element might not have the attribute, and there might be other attributes | 1633 // element might not have the attribute, and there might be other attributes |
1633 // which can identify the element. | 1634 // which can identify the element. |
1634 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1635 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
1635 name, | 1636 name, |
1636 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1637 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
1637 WebLocalFrameImpl* webframeChild = | 1638 WebLocalFrameImpl* webframeChild = |
1638 toWebLocalFrameImpl(m_client->createChildFrame( | 1639 toWebLocalFrameImpl(m_client->createChildFrame( |
1639 this, scope, name, uniqueName, | 1640 this, scope, name, uniqueName, |
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2372 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2373 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
2373 } else if (metric == "wasAlternateProtocolAvailable") { | 2374 } else if (metric == "wasAlternateProtocolAvailable") { |
2374 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2375 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
2375 } else if (metric == "connectionInfo") { | 2376 } else if (metric == "connectionInfo") { |
2376 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2377 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
2377 } | 2378 } |
2378 UseCounter::count(frame(), feature); | 2379 UseCounter::count(frame(), feature); |
2379 } | 2380 } |
2380 | 2381 |
2381 } // namespace blink | 2382 } // namespace blink |
OLD | NEW |