Revert of Implement /content/ combinator.

Source/core/css/CSSSelector.cpp

 /*
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *               1999 Waldo Bastian (bastian@kde.org)
  *               2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
  *               2001-2003 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 234 matching lines @@
     case PseudoRightPage:
     case PseudoInRange:
     case PseudoOutOfRange:
     case PseudoUserAgentCustomElement:
     case PseudoWebKitCustomElement:
     case PseudoCue:
     case PseudoFutureCue:
     case PseudoPastCue:
     case PseudoDistributed:
     case PseudoUnresolved:
+    case PseudoContent:
     case PseudoHost:
     case PseudoAncestor:
     case PseudoFullScreen:
     case PseudoFullScreenDocument:
     case PseudoFullScreenAncestor:
         return NOPSEUDO;
     case PseudoNotParsed:
         ASSERT_NOT_REACHED();
         return NOPSEUDO;
     }
@@ skipping 84 matching lines @@
 {"past",                          CSSSelector::PseudoPastCue,             0},
 {"-webkit-distributed(",          CSSSelector::PseudoDistributed,         0},
 {"in-range",                      CSSSelector::PseudoInRange,             0},
 {"out-of-range",                  CSSSelector::PseudoOutOfRange,          0},
 {"scope",                         CSSSelector::PseudoScope,               0},
 {"unresolved",                    CSSSelector::PseudoUnresolved,          0},
 {"host",                          CSSSelector::PseudoHost,                CSSSelector::RequiresShadowDOM},
 {"host(",                         CSSSelector::PseudoHost,                CSSSelector::RequiresShadowDOM},
 {"ancestor",                      CSSSelector::PseudoAncestor,            CSSSelector::RequiresShadowDOM},
 {"ancestor(",                     CSSSelector::PseudoAncestor,            CSSSelector::RequiresShadowDOM},
+{"content",                       CSSSelector::PseudoContent,             CSSSelector::RequiresShadowDOM},
 };
 
 static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap()
 {
     static HashMap<StringImpl*, CSSSelector::PseudoType>* nameToPseudoType = 0;
     if (!nameToPseudoType) {
         nameToPseudoType = new HashMap<StringImpl*, CSSSelector::PseudoType>;
 
         size_t pseudoCount = WTF_ARRAY_LENGTH(pseudoTypeMap);
         for (size_t i = 0; i < pseudoCount; i++) {
@@ skipping 85 matching lines @@
     case PseudoResizer:
     case PseudoScrollbar:
     case PseudoScrollbarCorner:
     case PseudoScrollbarButton:
     case PseudoScrollbarThumb:
     case PseudoScrollbarTrack:
     case PseudoScrollbarTrackPiece:
     case PseudoSelection:
     case PseudoUserAgentCustomElement:
     case PseudoWebKitCustomElement:
+    case PseudoContent:
         element = true;
         break;
     case PseudoUnknown:
     case PseudoEmpty:
     case PseudoFirstChild:
     case PseudoFirstOfType:
     case PseudoLastChild:
     case PseudoLastOfType:
     case PseudoOnlyChild:
     case PseudoOnlyOfType:
@@ skipping 161 matching lines @@
                     str.append(')');
                 }
                 break;
             }
             default:
                 break;
             }
         } else if (cs->m_match == CSSSelector::PseudoElement) {
             str.appendLiteral("::");
             str.append(cs->value());
+
+            if (cs->pseudoType() == PseudoContent) {
+                if (cs->relation() == CSSSelector::SubSelector && cs->tagHistory())
+                    return cs->tagHistory()->selectorText() + str.toString() + rightSide;
+            }
         } else if (cs->isAttributeSelector()) {
             str.append('[');
             const AtomicString& prefix = cs->attribute().prefix();
             if (!prefix.isNull()) {
                 str.append(prefix);
                 str.append("|");
             }
             str.append(cs->attribute().localName());
             switch (cs->m_match) {
                 case CSSSelector::Exact:
@@ skipping 27 matching lines @@
             }
         }
         if (cs->relation() != CSSSelector::SubSelector || !cs->tagHistory())
             break;
         cs = cs->tagHistory();
     }
 
     if (const CSSSelector* tagHistory = cs->tagHistory()) {
         switch (cs->relation()) {
         case CSSSelector::Descendant:
-            if (cs->relationIsAffectedByPseudoContent())
+            if (cs->relationIsAffectedByPseudoContent() && tagHistory->pseudoType() != CSSSelector::PseudoContent)
                 return tagHistory->selectorText("::-webkit-distributed(" + str.toString() + rightSide + ")");
             return tagHistory->selectorText(" " + str.toString() + rightSide);
         case CSSSelector::Child:
-            if (cs->relationIsAffectedByPseudoContent())
+            if (cs->relationIsAffectedByPseudoContent() && tagHistory->pseudoType() != CSSSelector::PseudoContent)
                 return tagHistory->selectorText("::-webkit-distributed(> " + str.toString() + rightSide + ")");
             return tagHistory->selectorText(" > " + str.toString() + rightSide);
         case CSSSelector::Shadow:
             return tagHistory->selectorText(" /shadow/ " + str.toString() + rightSide);
         case CSSSelector::ShadowDeep:
             return tagHistory->selectorText(" /shadow-deep/ " + str.toString() + rightSide);
         case CSSSelector::DirectAdjacent:
             return tagHistory->selectorText(" + " + str.toString() + rightSide);
         case CSSSelector::IndirectAdjacent:
             return tagHistory->selectorText(" ~ " + str.toString() + rightSide);
         case CSSSelector::SubSelector:
             ASSERT_NOT_REACHED();
         case CSSSelector::ShadowPseudo:
             return tagHistory->selectorText(str.toString() + rightSide);
-        case CSSSelector::ShadowContent:
-            return tagHistory->selectorText(" /content/ " + str.toString() + rightSide);
         }
     }
     return str.toString() + rightSide;
 }
 
 void CSSSelector::setAttribute(const QualifiedName& value)
 {
     createRareData();
     m_data.m_rareData->m_attribute = value;
 }
@@ skipping 160 matching lines @@
             return false;
         return (count - m_b) % m_a == 0;
     } else {
         if (count > m_b)
             return false;
         return (m_b - count) % (-m_a) == 0;
     }
 }
 
 } // namespace WebCore