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

[Timothy]

thatcher    05/11/10 15:50:32

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch kjs_html.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-11-10  Eric Seidel  <eseidel at apple.com>
  
          Reviewed by ggaren.
  
          * khtml/ecma/kjs_html.cpp:
          (KJS::Image::getValueProperty): resolve relative urls in Image::src
          http://bugzilla.opendarwin.org/show_bug.cgi?id=3473
          <rdar://problem/3787988> Preloaded Image objects .src field is not a fully resolved path (3473)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.47  +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.46
  retrieving revision 1.1.2.47
  diff -u -r1.1.2.46 -r1.1.2.47
  --- ChangeLog	10 Nov 2005 23:40:49 -0000	1.1.2.46
  +++ ChangeLog	10 Nov 2005 23:50:22 -0000	1.1.2.47
  @@ -2,6 +2,19 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-11-10  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by ggaren.
  +
  +        * khtml/ecma/kjs_html.cpp:
  +        (KJS::Image::getValueProperty): resolve relative urls in Image::src
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=3473
  +        <rdar://problem/3787988> Preloaded Image objects .src field is not a fully resolved path (3473)
  +
  +2005-11-10  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-11-01  Mitz Pettel  <opendarwin.org at mitzpettel.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.108.6.8 +1 -1      WebCore/khtml/ecma/kjs_html.cpp
  
  Index: kjs_html.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
  retrieving revision 1.108.6.7
  retrieving revision 1.108.6.8
  diff -u -r1.108.6.7 -r1.108.6.8
  --- kjs_html.cpp	10 Aug 2005 02:48:33 -0000	1.108.6.7
  +++ kjs_html.cpp	10 Nov 2005 23:50:28 -0000	1.108.6.8
  @@ -3416,7 +3416,7 @@
   {
     switch (token) {
     case Src:
  -    return String(src);
  +    return String(doc ? doc->completeURL(src.domString()) : src);
     case Complete:
       return Boolean(!img || img->status() >= khtml::CachedObject::Persistent);
     case OnLoad: