[webkit-changes] cvs commit: WebCore/khtml/xml dom_docimpl.h

[Maciej]

mjs         05/10/05 03:31:12

  Modified:    .        ChangeLog
               khtml/xml dom_docimpl.h
  Log:
          Reviewed by Eric.
  
  	- fixed <rdar://problem/3798746> hang in JavaScript getting at URL from frame; isc.fraunhofer.de (works in IE and Firefox)
  
  	* khtml/xml/dom_docimpl.h:
          (DOM::DocumentImpl::URL): if the URL is empty, return "about:blank", the JS DOM
  	at least counts on this, so we may as well do it for other languages too.
          (DOM::DocumentImpl::baseURL): base it on URL(), not m_url
  
  Revision  Changes    Path
  1.203     +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- ChangeLog	5 Oct 2005 08:21:34 -0000	1.202
  +++ ChangeLog	5 Oct 2005 10:31:10 -0000	1.203
  @@ -1,3 +1,14 @@
  +2005-10-05  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Eric.
  +
  +	- fixed <rdar://problem/3798746> hang in JavaScript getting at URL from frame; isc.fraunhofer.de (works in IE and Firefox)
  +        
  +	* khtml/xml/dom_docimpl.h:
  +        (DOM::DocumentImpl::URL): if the URL is empty, return "about:blank", the JS DOM
  +	at least counts on this, so we may as well do it for other languages too.
  +        (DOM::DocumentImpl::baseURL): base it on URL(), not m_url
  +
   2005-10-05  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by mjs.
  
  
  
  1.130     +2 -2      WebCore/khtml/xml/dom_docimpl.h
  
  Index: dom_docimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.h,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- dom_docimpl.h	3 Oct 2005 21:12:52 -0000	1.129
  +++ dom_docimpl.h	5 Oct 2005 10:31:12 -0000	1.130
  @@ -317,10 +317,10 @@
       void finishParsing (  );
       void clear();
   
  -    QString URL() const { return m_url; }
  +    QString URL() const { return m_url.isEmpty() ? "about:blank" : m_url; }
       void setURL(const QString& url);
   
  -    QString baseURL() const { return m_baseURL.isEmpty() ? m_url : m_baseURL; }
  +    QString baseURL() const { return m_baseURL.isEmpty() ? URL() : m_baseURL; }
       void setBaseURL(const QString& baseURL) { m_baseURL = baseURL; }
   
       QString baseTarget() const { return m_baseTarget; }