[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:38 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 556bdb324253f2589b575db4165119bd534b3f16
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 10 17:58:41 2002 +0000

            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::setBaseURL):
    	Call setBaseURL on the underlying document all the time, not just
    	when we add a missing "/" character.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1522 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 43bce3f..f81705c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-10  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::setBaseURL):
+	Call setBaseURL on the underlying document all the time, not just
+	when we add a missing "/" character.
+
 2002-07-07  Maciej Stachowiak  <mjs at apple.com>
 
         WebCore part of fix for Radar 2953431 - JavaScript window.close()
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 43bce3f..f81705c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-10  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::setBaseURL):
+	Call setBaseURL on the underlying document all the time, not just
+	when we add a missing "/" character.
+
 2002-07-07  Maciej Stachowiak  <mjs at apple.com>
 
         WebCore part of fix for Radar 2953431 - JavaScript window.close()
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 43bce3f..f81705c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-07-10  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::setBaseURL):
+	Call setBaseURL on the underlying document all the time, not just
+	when we add a missing "/" character.
+
 2002-07-07  Maciej Stachowiak  <mjs at apple.com>
 
         WebCore part of fix for Radar 2953431 - JavaScript window.close()
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 25f9a33..09ee90d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -618,10 +618,10 @@ void KWQKHTMLPartImpl::setBaseURL(const KURL &url)
     m_baseURL = url;
     if (m_baseURL.protocol().startsWith( "http" ) && !m_baseURL.host().isEmpty() && m_baseURL.path().isEmpty()) {
         m_baseURL.setPath( "/" );
-        // communicate the change in base URL to the document so that links and subloads work
-        if (d->m_doc) {
-            d->m_doc->setBaseURL(url.url());
-        }
+    }
+    // communicate the change in base URL to the document so that links and subloads work
+    if (d->m_doc) {
+        d->m_doc->setBaseURL(url.url());
     }
 }
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 25f9a33..09ee90d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -618,10 +618,10 @@ void KWQKHTMLPartImpl::setBaseURL(const KURL &url)
     m_baseURL = url;
     if (m_baseURL.protocol().startsWith( "http" ) && !m_baseURL.host().isEmpty() && m_baseURL.path().isEmpty()) {
         m_baseURL.setPath( "/" );
-        // communicate the change in base URL to the document so that links and subloads work
-        if (d->m_doc) {
-            d->m_doc->setBaseURL(url.url());
-        }
+    }
+    // communicate the change in base URL to the document so that links and subloads work
+    if (d->m_doc) {
+        d->m_doc->setBaseURL(url.url());
     }
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list