[webkit-changes] cvs commit: WebCore/khtml/html htmltokenizer.cpp

[Adele]

adele       05/07/12 15:05:19

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch htmltokenizer.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4164967>
  
      2005-06-17  Adele Peterson  <adele at apple.com>
  
          Reviewed by Maciej.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3419
          <rdar://problem/4111752> REGRESSION (125-312/412): Safari doesn't display edmunds.com pages first time through
  
          * khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::parseTag): set 'script' flag when
            parsing <script src="foo" /> case.  In this case, parseTag calls the scriptHandler function which expects
            that flag to be set, and sets it back to false at the appropriate time.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.58 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.57
  retrieving revision 1.4104.2.58
  diff -u -r1.4104.2.57 -r1.4104.2.58
  --- ChangeLog	12 Jul 2005 21:59:55 -0000	1.4104.2.57
  +++ ChangeLog	12 Jul 2005 22:05:12 -0000	1.4104.2.58
  @@ -1,6 +1,22 @@
   2005-07-12  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  +        <rdar://problem/4164967>
  +
  +    2005-06-17  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Maciej.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3419
  +        <rdar://problem/4111752> REGRESSION (125-312/412): Safari doesn't display edmunds.com pages first time through
  +
  +        * khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::parseTag): set 'script' flag when 
  +          parsing <script src="foo" /> case.  In this case, parseTag calls the scriptHandler function which expects 
  +          that flag to be set, and sets it back to false at the appropriate time.
  +
  +2005-07-12  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
           <rdar://problem/4164964>
   
       2005-05-05  David Hyatt  <hyatt at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.84.6.1  +3 -1      WebCore/khtml/html/htmltokenizer.cpp
  
  Index: htmltokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
  retrieving revision 1.84
  retrieving revision 1.84.6.1
  diff -u -r1.84 -r1.84.6.1
  --- htmltokenizer.cpp	20 Mar 2005 00:58:28 -0000	1.84
  +++ htmltokenizer.cpp	12 Jul 2005 22:05:19 -0000	1.84.6.1
  @@ -1415,8 +1415,10 @@
                       script = true;
                       parseSpecial(src);
                   }
  -                else if (tagID <= ID_CLOSE_TAG) // Handle <script src="foo"/>
  +                else if (tagID <= ID_CLOSE_TAG) { // Handle <script src="foo"/>
  +                    script = true;
                       scriptHandler();
  +                }
                   break;
               case ID_STYLE:
                   if (beginTag) {