[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/html
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-03-30 13:04:54
Message-ID: 20050330130454.AB4A4632 () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Remove obsolete code. Since the white-space implementation PRE is no longer 
parsed differently from other text.


  M +3 -6      htmlparser.cpp   1.358
  M +0 -3      htmlparser.h   1.68
  M +1 -3      htmltokenizer.cpp   1.302


--- kdelibs/khtml/html/htmlparser.cpp  #1.357:1.358
@@ -187,5 +187,4 @@ void KHTMLParser::reset()
     m_inline = false;
 
-    inPre = 0;
     form = 0;
     map = 0;
@@ -908,5 +907,4 @@ NodeImpl *KHTMLParser::getElement(Token*
         break;
     case ID_PRE:
-        ++inPre;
     case ID_XMP:
     case ID_PLAINTEXT:
@@ -1139,4 +1137,5 @@ bool KHTMLParser::isResidualStyleTag(int
         case ID_A:
         case ID_FONT:
+        case ID_SPAN:
         case ID_TT:
         case ID_U:
@@ -1506,6 +1505,4 @@ void KHTMLParser::popOneBlock(bool delBl
     // we only set inline to false, if the element we close is a block level element.
     // This helps getting cases as <p><b>bla</b> <b>bla</b> right.
-    if (current->id() == ID_PRE)
-        --inPre;
 
     m_inline = Elem->m_inline;

--- kdelibs/khtml/html/htmlparser.h  #1.67:1.68
@@ -85,5 +85,4 @@ public:
     bool skipMode() const { return (discard_until != 0); }
     bool noSpaces() const { return (inSelect || !m_inline  || !inBody); }
-    bool preMode() const { return inPre; }
     bool selectMode() const { return inSelect; }
 
@@ -175,6 +174,4 @@ private:
 
 
-    int inPre;
-
     /*
      * tells the parser to discard all tags, until it reaches the one specified

--- kdelibs/khtml/html/htmltokenizer.cpp  #1.301:1.302
@@ -1140,9 +1140,7 @@ void HTMLTokenizer::parseTag(TokenizerSt
             processToken();
 
-            // lets see if we're still in parsing mood for spaces
-            pre = parser->preMode();
-
             switch( tagID ) {
             case ID_PRE:
+                pre = beginTag;
                 prePos = 0;
                 discard = AllDiscard;


[prev in list] [next in list] [prev in thread] [next in thread]