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

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

Issue 1885453002: Rename Node::treeScope() to Node::treeScopeOrDocument() Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 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
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 frame()->init(); 1533 frame()->init();
1534 if (frame() && frame()->loader().stateMachine()->isDisplayingInitialEmptyDoc ument() && !parent() && !opener() && frame()->settings()->shouldReuseGlobalForUn ownedMainFrame()) 1534 if (frame() && frame()->loader().stateMachine()->isDisplayingInitialEmptyDoc ument() && !parent() && !opener() && frame()->settings()->shouldReuseGlobalForUn ownedMainFrame())
1535 frame()->document()->getSecurityOrigin()->grantUniversalAccess(); 1535 frame()->document()->getSecurityOrigin()->grantUniversalAccess();
1536 } 1536 }
1537 1537
1538 LocalFrame* WebLocalFrameImpl::createChildFrame(const FrameLoadRequest& request, 1538 LocalFrame* WebLocalFrameImpl::createChildFrame(const FrameLoadRequest& request,
1539 const AtomicString& name, HTMLFrameOwnerElement* ownerElement) 1539 const AtomicString& name, HTMLFrameOwnerElement* ownerElement)
1540 { 1540 {
1541 DCHECK(m_client); 1541 DCHECK(m_client);
1542 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); 1542 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe");
1543 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() 1543 WebTreeScopeType scope = frame()->document() == ownerElement->treeScopeOrDoc ument()
1544 ? WebTreeScopeType::Document 1544 ? WebTreeScopeType::Document
1545 : WebTreeScopeType::Shadow; 1545 : WebTreeScopeType::Shadow;
1546 WebFrameOwnerProperties ownerProperties(ownerElement->scrollingMode(), owner Element->marginWidth(), ownerElement->marginHeight()); 1546 WebFrameOwnerProperties ownerProperties(ownerElement->scrollingMode(), owner Element->marginWidth(), ownerElement->marginHeight());
1547 // FIXME: Using subResourceAttributeName as fallback is not a perfect 1547 // FIXME: Using subResourceAttributeName as fallback is not a perfect
1548 // solution. subResourceAttributeName returns just one attribute name. The 1548 // solution. subResourceAttributeName returns just one attribute name. The
1549 // element might not have the attribute, and there might be other attributes 1549 // element might not have the attribute, and there might be other attributes
1550 // which can identify the element. 1550 // which can identify the element.
1551 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFram e( 1551 AtomicString uniqueName = frame()->tree().calculateUniqueNameForNewChildFram e(
1552 name, ownerElement->getAttribute(ownerElement->subResourceAttributeName( ))); 1552 name, ownerElement->getAttribute(ownerElement->subResourceAttributeName( )));
1553 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild Frame(this, scope, name, uniqueName, static_cast<WebSandboxFlags>(ownerElement-> getSandboxFlags()), ownerProperties)); 1553 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild Frame(this, scope, name, uniqueName, static_cast<WebSandboxFlags>(ownerElement-> getSandboxFlags()), ownerProperties));
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 return WebSandboxFlags::None; 2146 return WebSandboxFlags::None;
2147 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2147 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2148 } 2148 }
2149 2149
2150 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2150 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2151 { 2151 {
2152 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2152 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2153 } 2153 }
2154 2154
2155 } // namespace blink 2155 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698