Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2545693002: Support allowpaymentrequest with out-of-process iframes (Closed)
Patch Set: Fixed the error Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1588 const AtomicString& name, 1588 const AtomicString& name,
1589 HTMLFrameOwnerElement* ownerElement) { 1589 HTMLFrameOwnerElement* ownerElement) {
1590 DCHECK(m_client); 1590 DCHECK(m_client);
1591 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); 1591 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe");
1592 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() 1592 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope()
1593 ? WebTreeScopeType::Document 1593 ? WebTreeScopeType::Document
1594 : WebTreeScopeType::Shadow; 1594 : WebTreeScopeType::Shadow;
1595 WebFrameOwnerProperties ownerProperties( 1595 WebFrameOwnerProperties ownerProperties(
1596 ownerElement->scrollingMode(), ownerElement->marginWidth(), 1596 ownerElement->scrollingMode(), ownerElement->marginWidth(),
1597 ownerElement->marginHeight(), ownerElement->allowFullscreen(), 1597 ownerElement->marginHeight(), ownerElement->allowFullscreen(),
1598 ownerElement->csp(), ownerElement->delegatedPermissions()); 1598 ownerElement->allowPaymentRequest(), ownerElement->csp(),
1599 ownerElement->delegatedPermissions());
1599 // FIXME: Using subResourceAttributeName as fallback is not a perfect 1600 // FIXME: Using subResourceAttributeName as fallback is not a perfect
1600 // solution. subResourceAttributeName returns just one attribute name. The 1601 // solution. subResourceAttributeName returns just one attribute name. The
1601 // element might not have the attribute, and there might be other attributes 1602 // element might not have the attribute, and there might be other attributes
1602 // which can identify the element. 1603 // which can identify the element.
1603 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( 1604 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame(
1604 name, 1605 name,
1605 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); 1606 ownerElement->getAttribute(ownerElement->subResourceAttributeName()));
1606 WebLocalFrameImpl* webframeChild = 1607 WebLocalFrameImpl* webframeChild =
1607 toWebLocalFrameImpl(m_client->createChildFrame( 1608 toWebLocalFrameImpl(m_client->createChildFrame(
1608 this, scope, name, uniqueName, 1609 this, scope, name, uniqueName,
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
2351 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2352 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2352 } 2353 }
2353 UseCounter::count(frame(), feature); 2354 UseCounter::count(frame(), feature);
2354 } 2355 }
2355 2356
2356 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { 2357 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
2357 return m_inputMethodController.get(); 2358 return m_inputMethodController.get();
2358 } 2359 }
2359 2360
2360 } // namespace blink 2361 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698