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

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

Issue 138183003: Revert of Make ancestors of modal <dialog> inert (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « LayoutTests/fast/dom/HTMLDialogElement/modal-dialog-blocks-mouse-events-expected.txt ('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) 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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 785
786 bool Node::shouldHaveFocusAppearance() const 786 bool Node::shouldHaveFocusAppearance() const
787 { 787 {
788 ASSERT(focused()); 788 ASSERT(focused());
789 return true; 789 return true;
790 } 790 }
791 791
792 bool Node::isInert() const 792 bool Node::isInert() const
793 { 793 {
794 const HTMLDialogElement* dialog = document().activeModalDialog(); 794 const HTMLDialogElement* dialog = document().activeModalDialog();
795 if (dialog && this != document() && !dialog->containsIncludingShadowDOM(this )) 795 if (dialog && !containsIncludingShadowDOM(dialog) && !dialog->containsInclud ingShadowDOM(this))
796 return true; 796 return true;
797 return document().ownerElement() && document().ownerElement()->isInert(); 797 return document().ownerElement() && document().ownerElement()->isInert();
798 } 798 }
799 799
800 unsigned Node::nodeIndex() const 800 unsigned Node::nodeIndex() const
801 { 801 {
802 Node *_tempNode = previousSibling(); 802 Node *_tempNode = previousSibling();
803 unsigned count=0; 803 unsigned count=0;
804 for ( count=0; _tempNode; count++ ) 804 for ( count=0; _tempNode; count++ )
805 _tempNode = _tempNode->previousSibling(); 805 _tempNode = _tempNode->previousSibling();
(...skipping 1860 matching lines...) Expand 10 before | Expand all | Expand 10 after
2666 node->showTreeForThis(); 2666 node->showTreeForThis();
2667 } 2667 }
2668 2668
2669 void showNodePath(const WebCore::Node* node) 2669 void showNodePath(const WebCore::Node* node)
2670 { 2670 {
2671 if (node) 2671 if (node)
2672 node->showNodePathForThis(); 2672 node->showNodePathForThis();
2673 } 2673 }
2674 2674
2675 #endif 2675 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/HTMLDialogElement/modal-dialog-blocks-mouse-events-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698