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

Side by Side Diff: Source/core/dom/Node.cpp

Issue 133393002: Make ancestors of modal <dialog> inert (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: save a tree walk if able Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 791
792 bool Node::shouldHaveFocusAppearance() const 792 bool Node::shouldHaveFocusAppearance() const
793 { 793 {
794 ASSERT(focused()); 794 ASSERT(focused());
795 return true; 795 return true;
796 } 796 }
797 797
798 bool Node::isInert() const 798 bool Node::isInert() const
799 { 799 {
800 const HTMLDialogElement* dialog = document().activeModalDialog(); 800 const HTMLDialogElement* dialog = document().activeModalDialog();
801 if (dialog && !containsIncludingShadowDOM(dialog) && !dialog->containsInclud ingShadowDOM(this)) 801 if (dialog && this != document() && !dialog->containsIncludingShadowDOM(this ))
802 return true; 802 return true;
803 return document().ownerElement() && document().ownerElement()->isInert(); 803 return document().ownerElement() && document().ownerElement()->isInert();
804 } 804 }
805 805
806 unsigned Node::nodeIndex() const 806 unsigned Node::nodeIndex() const
807 { 807 {
808 Node *_tempNode = previousSibling(); 808 Node *_tempNode = previousSibling();
809 unsigned count=0; 809 unsigned count=0;
810 for ( count=0; _tempNode; count++ ) 810 for ( count=0; _tempNode; count++ )
811 _tempNode = _tempNode->previousSibling(); 811 _tempNode = _tempNode->previousSibling();
(...skipping 1880 matching lines...) Expand 10 before | Expand all | Expand 10 after
2692 node->showTreeForThis(); 2692 node->showTreeForThis();
2693 } 2693 }
2694 2694
2695 void showNodePath(const WebCore::Node* node) 2695 void showNodePath(const WebCore::Node* node)
2696 { 2696 {
2697 if (node) 2697 if (node)
2698 node->showNodePathForThis(); 2698 node->showNodePathForThis();
2699 } 2699 }
2700 2700
2701 #endif 2701 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698