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

[Vicki]

vicki       05/07/12 12:04:07

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_baseimpl.cpp
  Log:
  	- merge this fix from HEAD
  
      2005-07-11  Geoffrey Garen  <ggaren at apple.com>
  
  	-fixed rdar://problem/4170960
  	http://bugzilla.opendarwin.org/show_bug.cgi?id=3952
  	iFrame name and id information incorrectly returned
  
  	Reviewed by mjs.
  
          * khtml/html/html_baseimpl.cpp:
          (HTMLFrameElementImpl::attach): removed misleading comment
          (HTMLIFrameElementImpl::attach): copied FrameElementImpl behavior
  	for initializing m_name
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.50 +17 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.49
  retrieving revision 1.4104.2.50
  diff -u -r1.4104.2.49 -r1.4104.2.50
  --- ChangeLog	12 Jul 2005 18:28:57 -0000	1.4104.2.49
  +++ ChangeLog	12 Jul 2005 19:03:59 -0000	1.4104.2.50
  @@ -1,3 +1,20 @@
  +2005-07-12  Vicki Murley  <vicki at apple.com>
  +
  +	- merge this fix from HEAD
  +
  +    2005-07-11  Geoffrey Garen  <ggaren at apple.com>
  +
  +	-fixed rdar://problem/4170960 
  +	http://bugzilla.opendarwin.org/show_bug.cgi?id=3952 
  +	iFrame name and id information incorrectly returned
  +        
  +	Reviewed by mjs.
  +
  +        * khtml/html/html_baseimpl.cpp:
  +        (HTMLFrameElementImpl::attach): removed misleading comment
  +        (HTMLIFrameElementImpl::attach): copied FrameElementImpl behavior
  +	for initializing m_name
  +
   2005-07-12  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.68.8.1  +4 -2      WebCore/khtml/html/html_baseimpl.cpp
  
  Index: html_baseimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
  retrieving revision 1.68
  retrieving revision 1.68.8.1
  diff -u -r1.68 -r1.68.8.1
  --- html_baseimpl.cpp	3 Mar 2005 00:30:32 -0000	1.68
  +++ html_baseimpl.cpp	12 Jul 2005 19:04:06 -0000	1.68.8.1
  @@ -413,8 +413,6 @@
   
   void HTMLFrameElementImpl::attach()
   {
  -    // we should first look up via id, then via name.
  -    // this shortterm hack fixes the ugly case. ### rewrite needed for next release
       name = getAttribute(ATTR_NAME);
       if (name.isNull())
           name = getAttribute(ATTR_ID);
  @@ -759,6 +757,10 @@
   
   void HTMLIFrameElementImpl::attach()
   {
  +    name = getAttribute(ATTR_NAME);
  +    if (name.isNull())
  +        name = getAttribute(ATTR_ID);
  +
       HTMLElementImpl::attach();
   
       KHTMLPart *part = getDocument()->part();