[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:29:06 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d6e70b7c11a0c30bb8d0e29659dedf998d895f8c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 5 09:07:52 2002 +0000
Merged KHTMLPart::openURL method with khtml original.
* khtml/khtml_part.cpp:
(KHTMLPart::openURL): Don't call the impl version. Leave most of
this #ifdef'd, except the parts that look useful.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::openURL): Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7c51760..a85102d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::openURL method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openURL): Don't call the impl version. Leave most of
+ this #ifdef'd, except the parts that look useful.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Removed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::begin method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7c51760..a85102d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::openURL method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openURL): Don't call the impl version. Leave most of
+ this #ifdef'd, except the parts that look useful.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Removed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::begin method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7c51760..a85102d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::openURL method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openURL): Don't call the impl version. Leave most of
+ this #ifdef'd, except the parts that look useful.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Removed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::begin method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 0b4312c..df96580 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -352,10 +352,7 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_redirectionTimer.stop();
-#ifdef APPLE_CHANGES
- impl->openURL(url);
- return true;
-#else
+#ifndef APPLE_CHANGES
// check to see if this is an "error://" URL. This is caused when an error
// occurs before this part was loaded (e.g. KonqRun), and is passed to
// khtmlpart so that it can display the error.
@@ -451,6 +448,7 @@ bool KHTMLPart::openURL( const KURL &url )
connect( d->m_job, SIGNAL(redirection(KIO::Job*, const KURL&) ),
SLOT( slotRedirection(KIO::Job*,const KURL&) ) );
+#endif // APPLE_CHANGES
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
@@ -479,6 +477,7 @@ bool KHTMLPart::openURL( const KURL &url )
// copy to m_workingURL after fixing m_url above
d->m_workingURL = m_url;
+#ifndef APPLE_CHANGES
kdDebug( 6050 ) << "KHTMLPart::openURL now (before started) m_url = " << m_url.url() << endl;
connect( d->m_job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
@@ -488,9 +487,9 @@ bool KHTMLPart::openURL( const KURL &url )
this, SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
emit started( 0L );
+#endif // APPLE_CHANGES
return true;
-#endif // APPLE_CHANGES
}
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index d14d46f..471303f 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -67,8 +67,6 @@ public:
KHTMLView *getView() const;
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
- void openURL(const KURL &);
- void write(const char *str, int len);
void end();
void slotData(NSString *, const char *bytes, int length, bool complete = false);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 446e4bf..d3235e5 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -95,12 +95,6 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
return true;
}
-void KWQKHTMLPartImpl::openURL(const KURL &url)
-{
- d->m_workingURL = url;
- part->m_url = url;
-}
-
void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int length, bool complete)
{
// NOTE: This code emulates the interface used by the original khtml part
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index d14d46f..471303f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -67,8 +67,6 @@ public:
KHTMLView *getView() const;
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
- void openURL(const KURL &);
- void write(const char *str, int len);
void end();
void slotData(NSString *, const char *bytes, int length, bool complete = false);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 446e4bf..d3235e5 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -95,12 +95,6 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
return true;
}
-void KWQKHTMLPartImpl::openURL(const KURL &url)
-{
- d->m_workingURL = url;
- part->m_url = url;
-}
-
void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int length, bool complete)
{
// NOTE: This code emulates the interface used by the original khtml part
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list