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

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

Issue 2743053003: [Reland #1] Don't create layout objects for children of display-none iframes. (Closed)
Patch Set: rebaseline. Created 3 years, 8 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 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 HTMLFrameOwnerElement* ownerElement) { 1651 HTMLFrameOwnerElement* ownerElement) {
1652 DCHECK(m_client); 1652 DCHECK(m_client);
1653 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); 1653 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe");
1654 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() 1654 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope()
1655 ? WebTreeScopeType::Document 1655 ? WebTreeScopeType::Document
1656 : WebTreeScopeType::Shadow; 1656 : WebTreeScopeType::Shadow;
1657 WebFrameOwnerProperties ownerProperties( 1657 WebFrameOwnerProperties ownerProperties(
1658 ownerElement->browsingContextContainerName(), 1658 ownerElement->browsingContextContainerName(),
1659 ownerElement->scrollingMode(), ownerElement->marginWidth(), 1659 ownerElement->scrollingMode(), ownerElement->marginWidth(),
1660 ownerElement->marginHeight(), ownerElement->allowFullscreen(), 1660 ownerElement->marginHeight(), ownerElement->allowFullscreen(),
1661 ownerElement->allowPaymentRequest(), ownerElement->csp(), 1661 ownerElement->allowPaymentRequest(), ownerElement->isDisplayNone(),
1662 ownerElement->allowedFeatures()); 1662 ownerElement->csp(), ownerElement->allowedFeatures());
1663 // FIXME: Using subResourceAttributeName as fallback is not a perfect 1663 // FIXME: Using subResourceAttributeName as fallback is not a perfect
1664 // solution. subResourceAttributeName returns just one attribute name. The 1664 // solution. subResourceAttributeName returns just one attribute name. The
1665 // element might not have the attribute, and there might be other attributes 1665 // element might not have the attribute, and there might be other attributes
1666 // which can identify the element. 1666 // which can identify the element.
1667 WebLocalFrameImpl* webframeChild = 1667 WebLocalFrameImpl* webframeChild =
1668 toWebLocalFrameImpl(m_client->createChildFrame( 1668 toWebLocalFrameImpl(m_client->createChildFrame(
1669 this, scope, name, 1669 this, scope, name,
1670 ownerElement->getAttribute(ownerElement->subResourceAttributeName()), 1670 ownerElement->getAttribute(ownerElement->subResourceAttributeName()),
1671 static_cast<WebSandboxFlags>(ownerElement->getSandboxFlags()), 1671 static_cast<WebSandboxFlags>(ownerElement->getSandboxFlags()),
1672 ownerProperties)); 1672 ownerProperties));
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2515 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2516 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2516 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2517 } else { 2517 } else {
2518 clipHtml = 2518 clipHtml =
2519 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2519 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2520 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2520 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2521 } 2521 }
2522 } 2522 }
2523 2523
2524 } // namespace blink 2524 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrame.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698