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

Side by Side Diff: sky/engine/core/dom/Node.cpp

Issue 854803003: Fix the build. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | 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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 } 1652 }
1653 1653
1654 bool Node::isUserActionElementFocused() const 1654 bool Node::isUserActionElementFocused() const
1655 { 1655 {
1656 ASSERT(isUserActionElement()); 1656 ASSERT(isUserActionElement());
1657 return document().userActionElements().isFocused(this); 1657 return document().userActionElements().isFocused(this);
1658 } 1658 }
1659 1659
1660 void Node::setCustomElementState(CustomElementState newState) 1660 void Node::setCustomElementState(CustomElementState newState)
1661 { 1661 {
1662 CustomElementState oldState = customElementState();
1663
1664 switch (newState) { 1662 switch (newState) {
1665 case NotCustomElement: 1663 case NotCustomElement:
1666 ASSERT_NOT_REACHED(); // Everything starts in this state 1664 ASSERT_NOT_REACHED(); // Everything starts in this state
1667 return; 1665 return;
1668 1666
1669 case WaitingForUpgrade: 1667 case WaitingForUpgrade:
1670 ASSERT(NotCustomElement == oldState); 1668 ASSERT(NotCustomElement == customElementState());
1671 break; 1669 break;
1672 1670
1673 case Upgraded: 1671 case Upgraded:
1674 ASSERT(WaitingForUpgrade == oldState); 1672 ASSERT(WaitingForUpgrade == customElementState());
1675 break; 1673 break;
1676 } 1674 }
1677 1675
1678 ASSERT(isHTMLElement()); 1676 ASSERT(isHTMLElement());
1679 setFlag(CustomElementFlag); 1677 setFlag(CustomElementFlag);
1680 setFlag(newState == Upgraded, CustomElementUpgradedFlag); 1678 setFlag(newState == Upgraded, CustomElementUpgradedFlag);
1681 } 1679 }
1682 1680
1683 unsigned Node::lengthOfContents() const 1681 unsigned Node::lengthOfContents() const
1684 { 1682 {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 node->showTreeForThis(); 1724 node->showTreeForThis();
1727 } 1725 }
1728 1726
1729 void showNodePath(const blink::Node* node) 1727 void showNodePath(const blink::Node* node)
1730 { 1728 {
1731 if (node) 1729 if (node)
1732 node->showNodePathForThis(); 1730 node->showNodePathForThis();
1733 } 1731 }
1734 1732
1735 #endif 1733 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698