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

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

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 { 680 {
681 DCHECK(focused()); 681 DCHECK(focused());
682 return true; 682 return true;
683 } 683 }
684 684
685 bool Node::isInert() const 685 bool Node::isInert() const
686 { 686 {
687 const HTMLDialogElement* dialog = document().activeModalDialog(); 687 const HTMLDialogElement* dialog = document().activeModalDialog();
688 if (dialog && this != document() && (!canParticipateInFlatTree() || !FlatTre eTraversal::containsIncludingPseudoElement(*dialog, *this))) 688 if (dialog && this != document() && (!canParticipateInFlatTree() || !FlatTre eTraversal::containsIncludingPseudoElement(*dialog, *this)))
689 return true; 689 return true;
690 return document().ownerElement() && document().ownerElement()->isInert(); 690 return document().localOwnerElement() && document().localOwnerElement()->isI nert();
691 } 691 }
692 692
693 unsigned Node::nodeIndex() const 693 unsigned Node::nodeIndex() const
694 { 694 {
695 const Node* tempNode = previousSibling(); 695 const Node* tempNode = previousSibling();
696 unsigned count = 0; 696 unsigned count = 0;
697 for (count = 0; tempNode; count++) 697 for (count = 0; tempNode; count++)
698 tempNode = tempNode->previousSibling(); 698 tempNode = tempNode->previousSibling();
699 return count; 699 return count;
700 } 700 }
(...skipping 1631 matching lines...) Expand 10 before | Expand all | Expand 10 after
2332 2332
2333 void showNodePath(const blink::Node* node) 2333 void showNodePath(const blink::Node* node)
2334 { 2334 {
2335 if (node) 2335 if (node)
2336 node->showNodePathForThis(); 2336 node->showNodePathForThis();
2337 else 2337 else
2338 fprintf(stderr, "Cannot showNodePath for (nil)\n"); 2338 fprintf(stderr, "Cannot showNodePath for (nil)\n");
2339 } 2339 }
2340 2340
2341 #endif 2341 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698