[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:28:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3d1b40672d46302aafa96ba0e6555c38234f7d95
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 1 21:48:56 2002 +0000
Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
since nothing should really need them any more.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::begin): Set base URL on document, if it exists.
(KWQKHTMLPartImpl::requestFrame): Get base URL from document.
(KWQKHTMLPartImpl::requestObject): Ditto.
(KWQKHTMLPartImpl::frames): Ditto.
(KWQKHTMLPartImpl::setBaseURL): Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a9e964f..b2156f1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
+ Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
+ since nothing should really need them any more.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Set base URL on document, if it exists.
+ (KWQKHTMLPartImpl::requestFrame): Get base URL from document.
+ (KWQKHTMLPartImpl::requestObject): Ditto.
+ (KWQKHTMLPartImpl::frames): Ditto.
+ (KWQKHTMLPartImpl::setBaseURL): Removed.
+
2002-08-01 Richard Williamson (Local) <rjw at apple.com>
Added method to allow WebKit to direct khtml to
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a9e964f..b2156f1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
+ Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
+ since nothing should really need them any more.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Set base URL on document, if it exists.
+ (KWQKHTMLPartImpl::requestFrame): Get base URL from document.
+ (KWQKHTMLPartImpl::requestObject): Ditto.
+ (KWQKHTMLPartImpl::frames): Ditto.
+ (KWQKHTMLPartImpl::setBaseURL): Removed.
+
2002-08-01 Richard Williamson (Local) <rjw at apple.com>
Added method to allow WebKit to direct khtml to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9e964f..b2156f1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
+ Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
+ since nothing should really need them any more.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Set base URL on document, if it exists.
+ (KWQKHTMLPartImpl::requestFrame): Get base URL from document.
+ (KWQKHTMLPartImpl::requestObject): Ditto.
+ (KWQKHTMLPartImpl::frames): Ditto.
+ (KWQKHTMLPartImpl::setBaseURL): Removed.
+
2002-08-01 Richard Williamson (Local) <rjw at apple.com>
Added method to allow WebKit to direct khtml to
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index eb427b1..1da6344 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -79,8 +79,6 @@ public:
bool gotoBaseAnchor();
- void setBaseURL(const KURL &);
-
void setTitle(const DOM::DOMString &);
void setStatusBarText(const QString &status);
@@ -117,8 +115,6 @@ private:
int m_redirectionTimer;
- KURL m_baseURL;
-
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index b850863..e7c048b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -135,7 +135,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
d->m_bComplete = false;
// d->m_referrer = url.url();
part->m_url = url;
- KURL baseurl;
// ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
if (args.serviceType == "text/xml")
@@ -146,14 +145,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
//DomShared::instanceToCheck = (void *)((DomShared *)d->m_doc);
d->m_doc->ref();
- if (m_baseURL.isEmpty()) {
- m_baseURL = KURL();
- }
- else {
- // If we get here, this means the part has received a redirect before
- // m_doc was created. Update the document with the base URL.
- d->m_doc->setBaseURL(m_baseURL.url());
- }
d->m_workingURL = url;
/* FIXME: this is a pretty gross way to make sure the decoder gets reinitialized for each page. */
@@ -168,7 +159,7 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setURL( url.url() );
// do not set base URL if it has already been set
- if (!d->m_workingURL.isEmpty() && m_baseURL.isEmpty())
+ if (!d->m_workingURL.isEmpty())
{
// We're not planning to support the KDE chained URL feature, AFAIK
#if KDE_CHAINED_URIS
@@ -177,11 +168,11 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
if ( !lst.isEmpty() )
baseurl = *lst.begin();
// Use this for relative links.
- // We prefer m_baseURL over m_url because m_url changes when we are
- // about to load a new page.
setBaseURL(baseurl);
#else
- setBaseURL(d->m_workingURL);
+ if (d->m_doc != NULL) {
+ d->m_doc->setBaseURL(d->m_workingURL.url());
+ }
#endif
}
@@ -295,7 +286,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
NSURL *childURL = part->completeURL(url).getNSURL();
if (childURL == nil) {
- NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());
+ NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", d->m_doc->baseURL().ascii(), url.ascii());
return false;
}
@@ -348,7 +339,7 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
viewForPluginWithURL:part->completeURL(url).getNSURL()
serviceType:serviceType.getNSString()
arguments:argsArray
- baseURL:m_baseURL.getNSURL()]);
+ baseURL:KURL(d->m_doc->baseURL()).getNSURL()]);
frame->setWidget(widget);
return true;
@@ -466,18 +457,6 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
return parts;
}
-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());
- }
-}
-
void KWQKHTMLPartImpl::setView(KHTMLView *view)
{
d->m_view = view;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index eb427b1..1da6344 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -79,8 +79,6 @@ public:
bool gotoBaseAnchor();
- void setBaseURL(const KURL &);
-
void setTitle(const DOM::DOMString &);
void setStatusBarText(const QString &status);
@@ -117,8 +115,6 @@ private:
int m_redirectionTimer;
- KURL m_baseURL;
-
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index b850863..e7c048b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -135,7 +135,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
d->m_bComplete = false;
// d->m_referrer = url.url();
part->m_url = url;
- KURL baseurl;
// ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
if (args.serviceType == "text/xml")
@@ -146,14 +145,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
//DomShared::instanceToCheck = (void *)((DomShared *)d->m_doc);
d->m_doc->ref();
- if (m_baseURL.isEmpty()) {
- m_baseURL = KURL();
- }
- else {
- // If we get here, this means the part has received a redirect before
- // m_doc was created. Update the document with the base URL.
- d->m_doc->setBaseURL(m_baseURL.url());
- }
d->m_workingURL = url;
/* FIXME: this is a pretty gross way to make sure the decoder gets reinitialized for each page. */
@@ -168,7 +159,7 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setURL( url.url() );
// do not set base URL if it has already been set
- if (!d->m_workingURL.isEmpty() && m_baseURL.isEmpty())
+ if (!d->m_workingURL.isEmpty())
{
// We're not planning to support the KDE chained URL feature, AFAIK
#if KDE_CHAINED_URIS
@@ -177,11 +168,11 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
if ( !lst.isEmpty() )
baseurl = *lst.begin();
// Use this for relative links.
- // We prefer m_baseURL over m_url because m_url changes when we are
- // about to load a new page.
setBaseURL(baseurl);
#else
- setBaseURL(d->m_workingURL);
+ if (d->m_doc != NULL) {
+ d->m_doc->setBaseURL(d->m_workingURL.url());
+ }
#endif
}
@@ -295,7 +286,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
NSURL *childURL = part->completeURL(url).getNSURL();
if (childURL == nil) {
- NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());
+ NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", d->m_doc->baseURL().ascii(), url.ascii());
return false;
}
@@ -348,7 +339,7 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
viewForPluginWithURL:part->completeURL(url).getNSURL()
serviceType:serviceType.getNSString()
arguments:argsArray
- baseURL:m_baseURL.getNSURL()]);
+ baseURL:KURL(d->m_doc->baseURL()).getNSURL()]);
frame->setWidget(widget);
return true;
@@ -466,18 +457,6 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
return parts;
}
-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());
- }
-}
-
void KWQKHTMLPartImpl::setView(KHTMLView *view)
{
d->m_view = view;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list