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

Side by Side Diff: Source/core/css/CSSSelector.cpp

Issue 183853035: Renamed /shadow-all/ to /shadow/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 years, 9 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/css/CSSSelector.h ('k') | Source/core/css/CSSSelectorList.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) 1999-2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * 1999 Waldo Bastian (bastian@kde.org) 3 * 1999 Waldo Bastian (bastian@kde.org)
4 * 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch) 4 * 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
5 * 2001-2003 Dirk Mueller (mueller@kde.org) 5 * 2001-2003 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2008 David Smith (catfish.man@gmail.com) 7 * Copyright (C) 2008 David Smith (catfish.man@gmail.com)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 if (const CSSSelector* tagHistory = cs->tagHistory()) { 744 if (const CSSSelector* tagHistory = cs->tagHistory()) {
745 switch (cs->relation()) { 745 switch (cs->relation()) {
746 case CSSSelector::Descendant: 746 case CSSSelector::Descendant:
747 if (cs->relationIsAffectedByPseudoContent()) 747 if (cs->relationIsAffectedByPseudoContent())
748 return tagHistory->selectorText("::-webkit-distributed(" + str.t oString() + rightSide + ")"); 748 return tagHistory->selectorText("::-webkit-distributed(" + str.t oString() + rightSide + ")");
749 return tagHistory->selectorText(" " + str.toString() + rightSide); 749 return tagHistory->selectorText(" " + str.toString() + rightSide);
750 case CSSSelector::Child: 750 case CSSSelector::Child:
751 if (cs->relationIsAffectedByPseudoContent()) 751 if (cs->relationIsAffectedByPseudoContent())
752 return tagHistory->selectorText("::-webkit-distributed(> " + str .toString() + rightSide + ")"); 752 return tagHistory->selectorText("::-webkit-distributed(> " + str .toString() + rightSide + ")");
753 return tagHistory->selectorText(" > " + str.toString() + rightSide); 753 return tagHistory->selectorText(" > " + str.toString() + rightSide);
754 case CSSSelector::ShadowAll: 754 case CSSSelector::Shadow:
755 return tagHistory->selectorText(" /shadow-all/ " + str.toString() + rightSide); 755 return tagHistory->selectorText(" /shadow/ " + str.toString() + righ tSide);
756 case CSSSelector::ShadowDeep: 756 case CSSSelector::ShadowDeep:
757 return tagHistory->selectorText(" /shadow-deep/ " + str.toString() + rightSide); 757 return tagHistory->selectorText(" /shadow-deep/ " + str.toString() + rightSide);
758 case CSSSelector::DirectAdjacent: 758 case CSSSelector::DirectAdjacent:
759 return tagHistory->selectorText(" + " + str.toString() + rightSide); 759 return tagHistory->selectorText(" + " + str.toString() + rightSide);
760 case CSSSelector::IndirectAdjacent: 760 case CSSSelector::IndirectAdjacent:
761 return tagHistory->selectorText(" ~ " + str.toString() + rightSide); 761 return tagHistory->selectorText(" ~ " + str.toString() + rightSide);
762 case CSSSelector::SubSelector: 762 case CSSSelector::SubSelector:
763 ASSERT_NOT_REACHED(); 763 ASSERT_NOT_REACHED();
764 case CSSSelector::ShadowPseudo: 764 case CSSSelector::ShadowPseudo:
765 return tagHistory->selectorText(str.toString() + rightSide); 765 return tagHistory->selectorText(str.toString() + rightSide);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 return false; 938 return false;
939 return (count - m_b) % m_a == 0; 939 return (count - m_b) % m_a == 0;
940 } else { 940 } else {
941 if (count > m_b) 941 if (count > m_b)
942 return false; 942 return false;
943 return (m_b - count) % (-m_a) == 0; 943 return (m_b - count) % (-m_a) == 0;
944 } 944 }
945 } 945 }
946 946
947 } // namespace WebCore 947 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSSelector.h ('k') | Source/core/css/CSSSelectorList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698