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

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 1157563004: Revert of Update Blink to use the tree scope info on WebFrame for scoping checks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/page/FrameTree.cpp » ('j') | 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 402
403 LocalFrame* LocalFrame::localFrameRoot() 403 LocalFrame* LocalFrame::localFrameRoot()
404 { 404 {
405 LocalFrame* curFrame = this; 405 LocalFrame* curFrame = this;
406 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame()) 406 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame())
407 curFrame = toLocalFrame(curFrame->tree().parent()); 407 curFrame = toLocalFrame(curFrame->tree().parent());
408 408
409 return curFrame; 409 return curFrame;
410 } 410 }
411 411
412 bool LocalFrame::inScope(TreeScope* scope) const
413 {
414 ASSERT(scope);
415 Document* doc = document();
416 if (!doc)
417 return false;
418 // FIXME: This check is broken in for OOPI.
419 HTMLFrameOwnerElement* owner = doc->ownerElement();
420 if (!owner)
421 return false;
422 return owner->treeScope() == scope;
423 }
424
412 String LocalFrame::layerTreeAsText(LayerTreeFlags flags) const 425 String LocalFrame::layerTreeAsText(LayerTreeFlags flags) const
413 { 426 {
414 TextStream textStream; 427 TextStream textStream;
415 textStream << localLayerTreeAsText(flags); 428 textStream << localLayerTreeAsText(flags);
416 429
417 for (Frame* child = tree().firstChild(); child; child = child->tree().traver seNext(this)) { 430 for (Frame* child = tree().firstChild(); child; child = child->tree().traver seNext(this)) {
418 if (!child->isLocalFrame()) 431 if (!child->isLocalFrame())
419 continue; 432 continue;
420 String childLayerTree = toLocalFrame(child)->localLayerTreeAsText(flags) ; 433 String childLayerTree = toLocalFrame(child)->localLayerTreeAsText(flags) ;
421 if (!childLayerTree.length()) 434 if (!childLayerTree.length())
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 , m_textZoomFactor(parentTextZoomFactor(this)) 823 , m_textZoomFactor(parentTextZoomFactor(this))
811 , m_inViewSourceMode(false) 824 , m_inViewSourceMode(false)
812 { 825 {
813 if (isLocalRoot()) 826 if (isLocalRoot())
814 m_instrumentingAgents = InstrumentingAgents::create(); 827 m_instrumentingAgents = InstrumentingAgents::create();
815 else 828 else
816 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 829 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
817 } 830 }
818 831
819 } // namespace blink 832 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/page/FrameTree.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698