[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp

[Vicki]

vicki       05/06/14 11:06:23

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/ecma Tag: Safari-1-3-branch kjs_window.cpp
  Log:
  	- merged this fix from HEAD
  
      2005-06-13  Vicki Murley  <vicki at apple.com>
  
          Reviewed by Darin.
  
          No test cases added since the steps to reproduce require use of showModalDialog.
  
          - fix for <rdar://problem/4145910> parameters not working in showModalDialog
          test page (dialogWidth, dialogHeight, etc.)
  
          * khtml/ecma/kjs_window.cpp:
          (KJS::parseFeatures): add a check for colon character in the feature string
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4108.4.10 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4108.4.9
  retrieving revision 1.4108.4.10
  diff -u -r1.4108.4.9 -r1.4108.4.10
  --- ChangeLog	2 Jun 2005 16:35:45 -0000	1.4108.4.9
  +++ ChangeLog	14 Jun 2005 18:06:18 -0000	1.4108.4.10
  @@ -1,3 +1,19 @@
  +2005-06-14  Vicki Murley  <vicki at apple.com>
  +
  +	- merged this fix from HEAD
  +
  +    2005-06-13  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by Darin.
  +
  +        No test cases added since the steps to reproduce require use of showModalDialog.
  +
  +        - fix for <rdar://problem/4145910> parameters not working in showModalDialog 
  +        test page (dialogWidth, dialogHeight, etc.)
  +
  +        * khtml/ecma/kjs_window.cpp:
  +        (KJS::parseFeatures): add a check for colon character in the feature string
  +
   === WebCore-315.5 ===
   
   2005-06-02  Adele Peterson  <adele at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.146.6.2 +5 -0      WebCore/khtml/ecma/kjs_window.cpp
  
  Index: kjs_window.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
  retrieving revision 1.146.6.1
  retrieving revision 1.146.6.2
  diff -u -r1.146.6.1 -r1.146.6.2
  --- kjs_window.cpp	2 Jun 2005 15:49:16 -0000	1.146.6.1
  +++ kjs_window.cpp	14 Jun 2005 18:06:23 -0000	1.146.6.2
  @@ -500,6 +500,11 @@
       for (QStringList::ConstIterator it = features.begin(); it != end; ++it) {
           QString s = *it;
           int pos = s.find('=');
  +        int colonPos = s.find(':');
  +        if (pos >= 0 && colonPos >= 0)
  +            continue; // ignore any strings that have both = and :
  +        if (pos < 0)
  +            pos = colonPos;
           if (pos < 0) {
               // null string for value means key without value
               map.insert(s.stripWhiteSpace().lower(), QString());