[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:59:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0fe572327c31a3901cf058b71c8e023809100e8f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 12 18:43:08 2002 +0000
- fixed 3079499 -- blank page at http://www.sonyericsson.com/T68i/
* khtml/misc/loader.cpp:
(CachedCSSStyleSheet::checkNotify): Copy the clients list before iterating
over it, since clients can move around in the list or be removed.
(CachedScript::checkNotify): Ditto.
(CachedImage::do_notify): Ditto.
(CachedImage::movieStatus): Ditto.
- fixed double calls to openURL I noticed
* khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
Don't call openURL here at all. That happens indirectly as a result
of the load we kick off.
* kwq/KWQKHTMLPart.mm: Tweaks.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2632 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9354623..820e297 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,24 @@
2002-11-12 Darin Adler <darin at apple.com>
+ - fixed 3079499 -- blank page at http://www.sonyericsson.com/T68i/
+
+ * khtml/misc/loader.cpp:
+ (CachedCSSStyleSheet::checkNotify): Copy the clients list before iterating
+ over it, since clients can move around in the list or be removed.
+ (CachedScript::checkNotify): Ditto.
+ (CachedImage::do_notify): Ditto.
+ (CachedImage::movieStatus): Ditto.
+
+ - fixed double calls to openURL I noticed
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Don't call openURL here at all. That happens indirectly as a result
+ of the load we kick off.
+
+ * kwq/KWQKHTMLPart.mm: Tweaks.
+
+2002-11-12 Darin Adler <darin at apple.com>
+
- fixed 3083043 -- Alex doesn't decode % sequences in javascript: URLs
Some places here did KURL::decode_string, but others didn't.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9354623..820e297 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,24 @@
2002-11-12 Darin Adler <darin at apple.com>
+ - fixed 3079499 -- blank page at http://www.sonyericsson.com/T68i/
+
+ * khtml/misc/loader.cpp:
+ (CachedCSSStyleSheet::checkNotify): Copy the clients list before iterating
+ over it, since clients can move around in the list or be removed.
+ (CachedScript::checkNotify): Ditto.
+ (CachedImage::do_notify): Ditto.
+ (CachedImage::movieStatus): Ditto.
+
+ - fixed double calls to openURL I noticed
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Don't call openURL here at all. That happens indirectly as a result
+ of the load we kick off.
+
+ * kwq/KWQKHTMLPart.mm: Tweaks.
+
+2002-11-12 Darin Adler <darin at apple.com>
+
- fixed 3083043 -- Alex doesn't decode % sequences in javascript: URLs
Some places here did KURL::decode_string, but others didn't.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9354623..820e297 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,24 @@
2002-11-12 Darin Adler <darin at apple.com>
+ - fixed 3079499 -- blank page at http://www.sonyericsson.com/T68i/
+
+ * khtml/misc/loader.cpp:
+ (CachedCSSStyleSheet::checkNotify): Copy the clients list before iterating
+ over it, since clients can move around in the list or be removed.
+ (CachedScript::checkNotify): Ditto.
+ (CachedImage::do_notify): Ditto.
+ (CachedImage::movieStatus): Ditto.
+
+ - fixed double calls to openURL I noticed
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Don't call openURL here at all. That happens indirectly as a result
+ of the load we kick off.
+
+ * kwq/KWQKHTMLPart.mm: Tweaks.
+
+2002-11-12 Darin Adler <darin at apple.com>
+
- fixed 3083043 -- Alex doesn't decode % sequences in javascript: URLs
Some places here did KURL::decode_string, but others didn't.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 07eb15f..2a12a69 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1002,6 +1002,8 @@ DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
return 0;
}
+#if !APPLE_CHANGES
+
/*bool KHTMLPart::isSSLInUse() const
{
return d->m_ssl_in_use;
@@ -1035,18 +1037,14 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const QByteArray &data )
if (p && p->d->m_ssl_in_use != d->m_ssl_in_use) {
while (p->parentPart()) p = p->parentPart();
-#if !APPLE_CHANGES
p->d->m_paSecurity->setIcon( "halfencrypted" );
-#endif
p->d->m_bSecurityInQuestion = true;
kdDebug(6050) << "parent setIcon half done." << endl;
}
}
-#if !APPLE_CHANGES
d->m_paSecurity->setIcon( d->m_ssl_in_use ? "encrypted" : "decrypted" );
kdDebug(6050) << "setIcon " << ( d->m_ssl_in_use ? "encrypted" : "decrypted" ) << " done." << endl;
-#endif
// Shouldn't all of this be done only if ssl_in_use == true ? (DF)
@@ -1141,8 +1139,6 @@ void KHTMLPart::slotRestoreData(const QByteArray &data )
}
}
-#if !APPLE_CHANGES
-
void KHTMLPart::showError( KIO::Job* job )
{
kdDebug() << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
@@ -2897,9 +2893,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
if ( child->m_extension )
child->m_extension->setURLArgs( child->m_args );
-#if APPLE_CHANGES
- if ( !url.isEmpty() )
-#else
+#if !APPLE_CHANGES
if(url.protocol() == "javascript" || url.url() == "about:blank") {
if (!child->m_part->inherits("KHTMLPart"))
return false;
@@ -2918,12 +2912,12 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
return true;
}
else if ( !url.isEmpty() )
-#endif
{
//kdDebug( 6050 ) << "opening " << url.url() << " in frame " << child->m_part << endl;
return child->m_part->openURL( url );
}
else
+#endif
return true;
}
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index c767390..d7a2014 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -227,8 +227,9 @@ void CachedCSSStyleSheet::checkNotify()
kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.string() << endl;
#endif
+ QPtrList<CachedObjectClient> clients(m_clients);
CachedObjectClient *c;
- for ( c = m_clients.first(); c != 0; c = m_clients.next() )
+ for ( c = clients.first(); c != 0; c = clients.next() )
c->setStyleSheet( m_url, m_sheet );
}
@@ -301,8 +302,9 @@ void CachedScript::checkNotify()
{
if(m_loading) return;
+ QPtrList<CachedObjectClient> clients(m_clients);
CachedObjectClient *c;
- for ( c = m_clients.first(); c != 0; c = m_clients.next() )
+ for ( c = clients.first(); c != 0; c = clients.next() )
c->notifyFinished(this);
}
@@ -680,9 +682,9 @@ QRect CachedImage::valid_rect() const
void CachedImage::do_notify(const QPixmap& p, const QRect& r)
{
+ QPtrList<CachedObjectClient> clients(m_clients);
CachedObjectClient *c;
-
- for ( c = m_clients.first(); c != 0; c = m_clients.next() )
+ for ( c = clients.first(); c != 0; c = clients.next() )
c->setPixmap( p, r, this);
}
@@ -764,8 +766,9 @@ void CachedImage::movieStatus(int status)
}
}
+ QPtrList<CachedObjectClient> clients(m_clients);
CachedObjectClient *c;
- for ( c = m_clients.first(); c != 0; c = m_clients.next() )
+ for ( c = clients.first(); c != 0; c = clients.next() )
c->notifyFinished(this);
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1f36a0a..63190bd 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -137,20 +137,21 @@ void KWQKHTMLPart::openURL(const KURL &url)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
- // FIXME: We need to report this error to someone.
- } else {
- // FIXME: The lack of args here to get the reload flag from
- // indicates a problem in KHTMLPart::processObjectRequest,
- // where we are opening the URL before the args are set up.
- [_bridge loadURL:cocoaURL reload:NO triggeringEvent:nil];
+ // FIXME: Do we need to report an error to someone?
+ return;
}
+
+ // FIXME: The lack of args here to get the reload flag from
+ // indicates a problem in how we use KHTMLPart::processObjectRequest,
+ // where we are opening the URL before the args are set up.
+ [_bridge loadURL:cocoaURL reload:NO triggeringEvent:nil];
}
void KWQKHTMLPart::openURLRequest(const KURL &url, const URLArgs &args)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
- // FIXME: We need to report this error to someone.
+ // FIXME: Do we need to report an error to someone?
return;
}
@@ -171,7 +172,7 @@ void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *
part->begin(d->m_workingURL, 0, 0);
d->m_workingURL = KURL();
}
-
+
ASSERT(d->m_doc);
ASSERT(d->m_doc->parsing());
@@ -192,7 +193,6 @@ void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URL
return;
}
-
[bridgeForFrameName(args.frameName) loadURL:cocoaURL reload:args.reload triggeringEvent:_currentEvent];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list