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

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

Issue 2697713003: Initial Implementation of Iframe Attribute for Feature Policy (Part 2) (Closed)
Patch Set: Initial Impl Created 3 years, 10 months 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 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 DCHECK(m_client); 1600 DCHECK(m_client);
1601 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); 1601 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe");
1602 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() 1602 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope()
1603 ? WebTreeScopeType::Document 1603 ? WebTreeScopeType::Document
1604 : WebTreeScopeType::Shadow; 1604 : WebTreeScopeType::Shadow;
1605 WebFrameOwnerProperties ownerProperties( 1605 WebFrameOwnerProperties ownerProperties(
1606 ownerElement->browsingContextContainerName(), 1606 ownerElement->browsingContextContainerName(),
1607 ownerElement->scrollingMode(), ownerElement->marginWidth(), 1607 ownerElement->scrollingMode(), ownerElement->marginWidth(),
1608 ownerElement->marginHeight(), ownerElement->allowFullscreen(), 1608 ownerElement->marginHeight(), ownerElement->allowFullscreen(),
1609 ownerElement->allowPaymentRequest(), ownerElement->csp(), 1609 ownerElement->allowPaymentRequest(), ownerElement->csp(),
1610 ownerElement->delegatedPermissions()); 1610 ownerElement->delegatedPermissions(),
1611 ownerElement->allowedFeatureNames());
1611 // FIXME: Using subResourceAttributeName as fallback is not a perfect 1612 // FIXME: Using subResourceAttributeName as fallback is not a perfect
1612 // solution. subResourceAttributeName returns just one attribute name. The 1613 // solution. subResourceAttributeName returns just one attribute name. The
1613 // element might not have the attribute, and there might be other attributes 1614 // element might not have the attribute, and there might be other attributes
1614 // which can identify the element. 1615 // which can identify the element.
1615 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame( 1616 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFrame(
1616 name, 1617 name,
1617 ownerElement->getAttribute(ownerElement->subResourceAttributeName())); 1618 ownerElement->getAttribute(ownerElement->subResourceAttributeName()));
1618 WebLocalFrameImpl* webframeChild = 1619 WebLocalFrameImpl* webframeChild =
1619 toWebLocalFrameImpl(m_client->createChildFrame( 1620 toWebLocalFrameImpl(m_client->createChildFrame(
1620 this, scope, name, uniqueName, 1621 this, scope, name, uniqueName,
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
2431 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2432 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2432 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2433 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2433 } else { 2434 } else {
2434 clipHtml = 2435 clipHtml =
2435 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2436 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2436 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2437 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2437 } 2438 }
2438 } 2439 }
2439 2440
2440 } // namespace blink 2441 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698