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

[Timothy]

thatcher    05/10/06 14:33:33

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch kjs_navigator.cpp
  Log:
          Fixes <rdar://problem/4286069> Intel Safari gives "MacPPC" for JavaScript navigator.platform
  
          Reviewed by Geoff.
  
          * khtml/ecma/kjs_navigator.cpp:
          (Navigator::getValueProperty): Return MacPPC or MacIntel
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.35  +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.34
  retrieving revision 1.1.2.35
  diff -u -r1.1.2.34 -r1.1.2.35
  --- ChangeLog	5 Oct 2005 16:11:26 -0000	1.1.2.34
  +++ ChangeLog	6 Oct 2005 21:33:31 -0000	1.1.2.35
  @@ -1,3 +1,12 @@
  +2005-10-06  Timothy Hatcher  <timothy at apple.com>
  +
  +        Fixes <rdar://problem/4286069> Intel Safari gives "MacPPC" for JavaScript navigator.platform
  +
  +        Reviewed by Geoff.
  +
  +        * khtml/ecma/kjs_navigator.cpp:
  +        (Navigator::getValueProperty): Return MacPPC or MacIntel
  +
   2005-10-05  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.27.12.1 +7 -3      WebCore/khtml/ecma/kjs_navigator.cpp
  
  Index: kjs_navigator.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_navigator.cpp,v
  retrieving revision 1.27
  retrieving revision 1.27.12.1
  diff -u -r1.27 -r1.27.12.1
  --- kjs_navigator.cpp	12 Jul 2004 23:33:10 -0000	1.27
  +++ kjs_navigator.cpp	6 Oct 2005 21:33:33 -0000	1.27.12.1
  @@ -224,11 +224,15 @@
       return String(userAgent);
     case Platform:
       // yet another evil hack, but necessary to spoof some sites...
  -    if ( (userAgent.find(QString::fromLatin1("Win"),0,false)>=0) )
  +    if (userAgent.find(QString::fromLatin1("Win"),0,false)>=0)
         return String(QString::fromLatin1("Win32"));
  -    else if ( (userAgent.find(QString::fromLatin1("Macintosh"),0,false)>=0) ||
  -              (userAgent.find(QString::fromLatin1("Mac_PowerPC"),0,false)>=0) )
  +    else if (userAgent.find(QString::fromLatin1("Mac"),0,false)>=0 &&
  +            (userAgent.find(QString::fromLatin1("PPC"),0,false)>=0 ||
  +             userAgent.find(QString::fromLatin1("PowerPC"),0,false)>=0))
         return String(QString::fromLatin1("MacPPC"));
  +    else if (userAgent.find(QString::fromLatin1("Mac"),0,false)>=0 &&
  +             userAgent.find(QString::fromLatin1("Intel"),0,false)>=0)
  +      return String(QString::fromLatin1("MacIntel"));
       else
         return String(QString::fromLatin1("X11"));
     case _Plugins: