[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:25:36 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3aec0aab8be501d0bbd54f0c0ab830ab8c9e93df
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 19 21:19:54 2002 +0000
top level:
* Site/favicon.ico: Removed.
WebCore:
Per darin, only define loadIcon in KWQKHTMLPartImpl
* khtml/html/html_headimpl.cpp:
(HTMLLinkElementImpl::process):
* khtml/khtml_part.cpp:
* khtml/khtml_part.h:
WebKit:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _loadPageIconIfNecessary]): use the correct relative string to request favicon.ico
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 791527d..1dcf4ea 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-07-19 Chris Blumenberg <cblu at apple.com>
+ Per darin, only define loadIcon in KWQKHTMLPartImpl
+
+ * khtml/html/html_headimpl.cpp:
+ (HTMLLinkElementImpl::process):
+ * khtml/khtml_part.cpp:
+ * khtml/khtml_part.h:
+
+2002-07-19 Chris Blumenberg <cblu at apple.com>
+
* khtml/html/html_headimpl.cpp:
(HTMLLinkElementImpl::process): added an APPLE_CHANGES
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 791527d..1dcf4ea 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
2002-07-19 Chris Blumenberg <cblu at apple.com>
+ Per darin, only define loadIcon in KWQKHTMLPartImpl
+
+ * khtml/html/html_headimpl.cpp:
+ (HTMLLinkElementImpl::process):
+ * khtml/khtml_part.cpp:
+ * khtml/khtml_part.h:
+
+2002-07-19 Chris Blumenberg <cblu at apple.com>
+
* khtml/html/html_headimpl.cpp:
(HTMLLinkElementImpl::process): added an APPLE_CHANGES
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 791527d..1dcf4ea 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
2002-07-19 Chris Blumenberg <cblu at apple.com>
+ Per darin, only define loadIcon in KWQKHTMLPartImpl
+
+ * khtml/html/html_headimpl.cpp:
+ (HTMLLinkElementImpl::process):
+ * khtml/khtml_part.cpp:
+ * khtml/khtml_part.h:
+
+2002-07-19 Chris Blumenberg <cblu at apple.com>
+
* khtml/html/html_headimpl.cpp:
(HTMLLinkElementImpl::process): added an APPLE_CHANGES
* khtml/khtml_part.cpp:
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 79a3c6d..2296544 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -40,6 +40,10 @@
#include <kurl.h>
#include <kdebug.h>
+#ifdef APPLE_CHANGES
+#include "KWQKHTMLPartImpl.h"
+#endif
+
using namespace khtml;
HTMLBaseElementImpl::HTMLBaseElementImpl(DocumentPtr *doc)
@@ -165,7 +169,7 @@ void HTMLLinkElementImpl::process()
// IE extension: location of small icon for locationbar / bookmarks
#ifdef APPLE_CHANGES
if ( part && rel.contains("icon") && !m_url.isEmpty() && !part->parentPart())
- part->loadIcon( KURL(m_url.string()) );
+ part->impl->loadIcon( KURL(m_url.string()) );
#else
if ( part && rel.contains("shortcut icon") && !m_url.isEmpty() && !part->parentPart())
part->browserExtension()->setIconURL( KURL(m_url.string()) );
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 563c8f7..49deaa3 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4682,11 +4682,6 @@ void KHTMLPart::detachView()
impl->setView(0);
}
-void KHTMLPart::loadIcon(const KURL &url)
-{
- impl->loadIcon(url);
-}
-
#endif
using namespace KParts;
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index d4b64b0..d48af11 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1095,7 +1095,6 @@ public:
void setTitle(const DOM::DOMString &);
void detachView();
void setStatusBarText(const QString &);
- void loadIcon(const KURL &url);
KWQKHTMLPartImpl *impl;
friend class KWQKHTMLPartImpl;
#endif
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 766e7a5..e8018fe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
2002-07-19 Chris Blumenberg <cblu at apple.com>
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _loadPageIconIfNecessary]): use the correct relative string to request favicon.ico
+
+2002-07-19 Chris Blumenberg <cblu at apple.com>
+
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem image]): call [WebIconLoader defaultIcon]
* Misc.subproj/WebIconLoader.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 766e7a5..e8018fe 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
2002-07-19 Chris Blumenberg <cblu at apple.com>
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _loadPageIconIfNecessary]): use the correct relative string to request favicon.ico
+
+2002-07-19 Chris Blumenberg <cblu at apple.com>
+
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem image]): call [WebIconLoader defaultIcon]
* Misc.subproj/WebIconLoader.m:
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 290bc8d..bbb0f9c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -148,7 +148,7 @@
if([dataSourceURL isFileURL]){
iconURL = dataSourceURL;
} else {
- iconURL = [NSURL _web_URLWithString:@"favicon.ico" relativeToURL:[dataSourceURL absoluteURL]];
+ iconURL = [NSURL _web_URLWithString:@"/favicon.ico" relativeToURL:dataSourceURL];
}
[self _loadIcon:iconURL];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list