[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:00:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e9206b8e5cffd618b9b7241b3573f89a23773d29
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 2 20:47:54 2002 +0000
More noisy bulletproofing. Still need to find source of problem.
More relaxed about invalid states.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@937 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8f850e9..1b4ee8a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-02 Richard Williamson <rjw at apple.com>
+
+ More noisy bulletproofing. Still need to find source of problem.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
+ (KHTMLPart::write), (KHTMLPart::end):
+
2002-04-02 Darin Adler <darin at apple.com>
Fix some small storage leaks.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8f850e9..1b4ee8a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-04-02 Richard Williamson <rjw at apple.com>
+
+ More noisy bulletproofing. Still need to find source of problem.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
+ (KHTMLPart::write), (KHTMLPart::end):
+
2002-04-02 Darin Adler <darin at apple.com>
Fix some small storage leaks.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8f850e9..1b4ee8a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-04-02 Richard Williamson <rjw at apple.com>
+
+ More noisy bulletproofing. Still need to find source of problem.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
+ (KHTMLPart::write), (KHTMLPart::end):
+
2002-04-02 Darin Adler <darin at apple.com>
Fix some small storage leaks.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5cceac0..dc3b96a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -251,9 +251,6 @@ KHTMLPart::~KHTMLPart()
if ( d->m_doc != NULL ) {
d->m_doc->detach();
- if (d->m_doc->refCount() != 1) {
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- }
d->m_doc->deref();
}
@@ -442,6 +439,14 @@ void KHTMLPart::slotData(IFURLHandle *handle, const char *bytes, int length)
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding(enc, true);
}
+
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::slotData m_doc == 0 IGNORING DATA, url = %s\n", d->m_url.url().latin1());
+ return;
+ }
+
write(bytes, length);
}
@@ -612,7 +617,7 @@ void KHTMLPart::write( const QString &str )
// FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
// purposes only.
if (d->m_doc == 0){
- fprintf (stderr, "WARNING: m_doc == 0\n");
+ fprintf (stderr, "WARNING: KHTMLPart::write m_doc == 0\n");
}
if ( str.isNull() )
@@ -632,6 +637,13 @@ void KHTMLPart::write( const QString &str )
void KHTMLPart::end()
{
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::end m_doc == 0\n");
+ return;
+ }
+
#ifndef APPLE_CHANGES
KWQDEBUG2 ("0x%08x end(): for url %s\n", (unsigned int)this, d->m_url.url().latin1());
// make sure nothing's left in there...
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 5cceac0..dc3b96a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -251,9 +251,6 @@ KHTMLPart::~KHTMLPart()
if ( d->m_doc != NULL ) {
d->m_doc->detach();
- if (d->m_doc->refCount() != 1) {
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- }
d->m_doc->deref();
}
@@ -442,6 +439,14 @@ void KHTMLPart::slotData(IFURLHandle *handle, const char *bytes, int length)
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding(enc, true);
}
+
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::slotData m_doc == 0 IGNORING DATA, url = %s\n", d->m_url.url().latin1());
+ return;
+ }
+
write(bytes, length);
}
@@ -612,7 +617,7 @@ void KHTMLPart::write( const QString &str )
// FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
// purposes only.
if (d->m_doc == 0){
- fprintf (stderr, "WARNING: m_doc == 0\n");
+ fprintf (stderr, "WARNING: KHTMLPart::write m_doc == 0\n");
}
if ( str.isNull() )
@@ -632,6 +637,13 @@ void KHTMLPart::write( const QString &str )
void KHTMLPart::end()
{
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::end m_doc == 0\n");
+ return;
+ }
+
#ifndef APPLE_CHANGES
KWQDEBUG2 ("0x%08x end(): for url %s\n", (unsigned int)this, d->m_url.url().latin1());
// make sure nothing's left in there...
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 5cceac0..dc3b96a 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -251,9 +251,6 @@ KHTMLPart::~KHTMLPart()
if ( d->m_doc != NULL ) {
d->m_doc->detach();
- if (d->m_doc->refCount() != 1) {
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- }
d->m_doc->deref();
}
@@ -442,6 +439,14 @@ void KHTMLPart::slotData(IFURLHandle *handle, const char *bytes, int length)
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding(enc, true);
}
+
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::slotData m_doc == 0 IGNORING DATA, url = %s\n", d->m_url.url().latin1());
+ return;
+ }
+
write(bytes, length);
}
@@ -612,7 +617,7 @@ void KHTMLPart::write( const QString &str )
// FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
// purposes only.
if (d->m_doc == 0){
- fprintf (stderr, "WARNING: m_doc == 0\n");
+ fprintf (stderr, "WARNING: KHTMLPart::write m_doc == 0\n");
}
if ( str.isNull() )
@@ -632,6 +637,13 @@ void KHTMLPart::write( const QString &str )
void KHTMLPart::end()
{
+ // FIXME [rjw]: Remove this log eventually. Should never happen. For debugging
+ // purposes only.
+ if (d->m_doc == 0){
+ fprintf (stderr, "ERROR: KHTMLPart::end m_doc == 0\n");
+ return;
+ }
+
#ifndef APPLE_CHANGES
KWQDEBUG2 ("0x%08x end(): for url %s\n", (unsigned int)this, d->m_url.url().latin1());
// make sure nothing's left in there...
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 99ba1e5..f585c51 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-02 Richard Williamson <rjw at apple.com>
+
+ More relaxed about invalid states.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame
+ _transitionProvisionalToLayoutAcceptable]):
+
2002-04-02 Darin Adler <darin at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 99ba1e5..f585c51 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-02 Richard Williamson <rjw at apple.com>
+
+ More relaxed about invalid states.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame
+ _transitionProvisionalToLayoutAcceptable]):
+
2002-04-02 Darin Adler <darin at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 3706962..0c9e7e2 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -163,6 +163,7 @@ char *stateNames[6] = {
break;
}
+ case IFWEBFRAMESTATE_PROVISIONAL:
case IFWEBFRAMESTATE_COMPLETE:
case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
{
@@ -170,7 +171,6 @@ char *stateNames[6] = {
}
case IFWEBFRAMESTATE_UNINITIALIZED:
- case IFWEBFRAMESTATE_PROVISIONAL:
default:
{
[[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[data->state]] userInfo: nil] raise];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 3706962..0c9e7e2 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -163,6 +163,7 @@ char *stateNames[6] = {
break;
}
+ case IFWEBFRAMESTATE_PROVISIONAL:
case IFWEBFRAMESTATE_COMPLETE:
case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
{
@@ -170,7 +171,6 @@ char *stateNames[6] = {
}
case IFWEBFRAMESTATE_UNINITIALIZED:
- case IFWEBFRAMESTATE_PROVISIONAL:
default:
{
[[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[data->state]] userInfo: nil] raise];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list