| 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 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1578 const AtomicString& name, | 1578 const AtomicString& name, |
| 1579 HTMLFrameOwnerElement* ownerElement) { | 1579 HTMLFrameOwnerElement* ownerElement) { |
| 1580 DCHECK(m_client); | 1580 DCHECK(m_client); |
| 1581 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1581 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
| 1582 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1582 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
| 1583 ? WebTreeScopeType::Document | 1583 ? WebTreeScopeType::Document |
| 1584 : WebTreeScopeType::Shadow; | 1584 : WebTreeScopeType::Shadow; |
| 1585 WebFrameOwnerProperties ownerProperties( | 1585 WebFrameOwnerProperties ownerProperties( |
| 1586 ownerElement->scrollingMode(), ownerElement->marginWidth(), | 1586 ownerElement->scrollingMode(), ownerElement->marginWidth(), |
| 1587 ownerElement->marginHeight(), ownerElement->allowFullscreen(), | 1587 ownerElement->marginHeight(), ownerElement->allowFullscreen(), |
| 1588 ownerElement->allowPaymentRequest(), ownerElement->csp(), | 1588 ownerElement->allowPaymentRequest(), ownerElement->isDisplayNone(), |
| 1589 ownerElement->delegatedPermissions()); | 1589 ownerElement->csp(), ownerElement->delegatedPermissions()); |
| 1590 // FIXME: Using subResourceAttributeName as fallback is not a perfect | 1590 // FIXME: Using subResourceAttributeName as fallback is not a perfect |
| 1591 // solution. subResourceAttributeName returns just one attribute name. The | 1591 // solution. subResourceAttributeName returns just one attribute name. The |
| 1592 // element might not have the attribute, and there might be other attributes | 1592 // element might not have the attribute, and there might be other attributes |
| 1593 // which can identify the element. | 1593 // which can identify the element. |
| 1594 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( | 1594 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( |
| 1595 name, | 1595 name, |
| 1596 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); | 1596 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); |
| 1597 WebLocalFrameImpl* webframeChild = | 1597 WebLocalFrameImpl* webframeChild = |
| 1598 toWebLocalFrameImpl(m_client->createChildFrame( | 1598 toWebLocalFrameImpl(m_client->createChildFrame( |
| 1599 this, scope, name, uniqueName, | 1599 this, scope, name, uniqueName, |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2353 ->frameScheduler() | 2353 ->frameScheduler() |
| 2354 ->unthrottledTaskRunner() | 2354 ->unthrottledTaskRunner() |
| 2355 ->toSingleThreadTaskRunner(); | 2355 ->toSingleThreadTaskRunner(); |
| 2356 } | 2356 } |
| 2357 | 2357 |
| 2358 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2358 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2359 return m_inputMethodController.get(); | 2359 return m_inputMethodController.get(); |
| 2360 } | 2360 } |
| 2361 | 2361 |
| 2362 } // namespace blink | 2362 } // namespace blink |
| OLD | NEW |