[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 05:58:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fd16f800c1a0f92a680e424348a6e69a9fd64c82
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 22 08:44:13 2002 +0000
Fixed the following post-merge crashers:
2885602 - Alexander crashes when clicking on a particular link in Google groups
2885564 - Alexander crashes on load failures
* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Fix
Radar 2885602 by detaching the document from the view when the
view is destroyed. This was making the document reference a
destroyed view later.
* src/kwq/KWQKHTMLPart.mm:
(KHTMLPart::~KHTMLPart): Fix Radar 2885564 by checking if m_doc is
NULL, since it's now inititally set to NULL.
(KHTMLPart::KHTMLPart, KHTMLPart::init): Formatting tweaks.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@801 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 5d99c48..f4260fa 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -100,8 +100,6 @@ number_object.lut.h: number_object.cpp
string_object.lut.h: string_object.cpp
./create_hash_table string_object.cpp -i > string_object.lut.h
-
-
BUILT_SOURCES = $(GRAMMAR_FILES) $(LUT_FILES) grammar-stamp
CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d88c02c..2354edc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-03-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed the following post-merge crashers:
+
+ 2885602 - Alexander crashes when clicking on a particular link in Google groups
+ 2885564 - Alexander crashes on load failures
+
+ * src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Fix
+ Radar 2885602 by detaching the document from the view when the
+ view is destroyed. This was making the document reference a
+ destroyed view later.
+
+ * src/kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::~KHTMLPart): Fix Radar 2885564 by checking if m_doc is
+ NULL, since it's now inititally set to NULL.
+ (KHTMLPart::KHTMLPart, KHTMLPart::init): Formatting tweaks.
+
2002-03-20 Maciej Stachowiak <mjs at apple.com>
Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d88c02c..2354edc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2002-03-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed the following post-merge crashers:
+
+ 2885602 - Alexander crashes when clicking on a particular link in Google groups
+ 2885564 - Alexander crashes on load failures
+
+ * src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Fix
+ Radar 2885602 by detaching the document from the view when the
+ view is destroyed. This was making the document reference a
+ destroyed view later.
+
+ * src/kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::~KHTMLPart): Fix Radar 2885564 by checking if m_doc is
+ NULL, since it's now inititally set to NULL.
+ (KHTMLPart::KHTMLPart, KHTMLPart::init): Formatting tweaks.
+
2002-03-20 Maciej Stachowiak <mjs at apple.com>
Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d88c02c..2354edc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2002-03-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed the following post-merge crashers:
+
+ 2885602 - Alexander crashes when clicking on a particular link in Google groups
+ 2885564 - Alexander crashes on load failures
+
+ * src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Fix
+ Radar 2885602 by detaching the document from the view when the
+ view is destroyed. This was making the document reference a
+ destroyed view later.
+
+ * src/kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::~KHTMLPart): Fix Radar 2885564 by checking if m_doc is
+ NULL, since it's now inititally set to NULL.
+ (KHTMLPart::KHTMLPart, KHTMLPart::init): Formatting tweaks.
+
2002-03-20 Maciej Stachowiak <mjs at apple.com>
Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 492a771..6483302 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -229,7 +229,6 @@ KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
KHTMLView::~KHTMLView()
{
-#ifndef APPLE_CHANGES
if (m_part)
{
//WABA: Is this Ok? Do I need to deref it as well?
@@ -238,7 +237,6 @@ KHTMLView::~KHTMLView()
if (doc)
doc->detach();
}
-#endif /* APPLE_CHANGES not defined */
delete d; d = 0;
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 24efd8a..6aa1ae3 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -242,8 +242,7 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
return result;
}
-KHTMLPart::KHTMLPart(
-)
+KHTMLPart::KHTMLPart()
{
init();
}
@@ -253,23 +252,22 @@ KHTMLPart::KHTMLPart(const KURL &url)
init();
}
-void KHTMLPart::init
-(
-)
+void KHTMLPart::init()
{
d = new KHTMLPartPrivate(this);
}
KHTMLPart::~KHTMLPart()
{
- if ( d->m_doc )
- d->m_doc->detach();
+ 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();
+ }
- if (d->m_doc->refCount() != 1)
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- if ( d->m_doc )
- d->m_doc->deref();
-
d->m_doc = 0;
delete d;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 24efd8a..6aa1ae3 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -242,8 +242,7 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
return result;
}
-KHTMLPart::KHTMLPart(
-)
+KHTMLPart::KHTMLPart()
{
init();
}
@@ -253,23 +252,22 @@ KHTMLPart::KHTMLPart(const KURL &url)
init();
}
-void KHTMLPart::init
-(
-)
+void KHTMLPart::init()
{
d = new KHTMLPartPrivate(this);
}
KHTMLPart::~KHTMLPart()
{
- if ( d->m_doc )
- d->m_doc->detach();
+ 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();
+ }
- if (d->m_doc->refCount() != 1)
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- if ( d->m_doc )
- d->m_doc->deref();
-
d->m_doc = 0;
delete d;
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.cpp b/WebCore/src/kdelibs/khtml/khtmlview.cpp
index 492a771..6483302 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.cpp
+++ b/WebCore/src/kdelibs/khtml/khtmlview.cpp
@@ -229,7 +229,6 @@ KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
KHTMLView::~KHTMLView()
{
-#ifndef APPLE_CHANGES
if (m_part)
{
//WABA: Is this Ok? Do I need to deref it as well?
@@ -238,7 +237,6 @@ KHTMLView::~KHTMLView()
if (doc)
doc->detach();
}
-#endif /* APPLE_CHANGES not defined */
delete d; d = 0;
}
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
index 5d99c48..f4260fa 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -100,8 +100,6 @@ number_object.lut.h: number_object.cpp
string_object.lut.h: string_object.cpp
./create_hash_table string_object.cpp -i > string_object.lut.h
-
-
BUILT_SOURCES = $(GRAMMAR_FILES) $(LUT_FILES) grammar-stamp
CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 24efd8a..6aa1ae3 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -242,8 +242,7 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
return result;
}
-KHTMLPart::KHTMLPart(
-)
+KHTMLPart::KHTMLPart()
{
init();
}
@@ -253,23 +252,22 @@ KHTMLPart::KHTMLPart(const KURL &url)
init();
}
-void KHTMLPart::init
-(
-)
+void KHTMLPart::init()
{
d = new KHTMLPartPrivate(this);
}
KHTMLPart::~KHTMLPart()
{
- if ( d->m_doc )
- d->m_doc->detach();
+ 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();
+ }
- if (d->m_doc->refCount() != 1)
- fprintf (stdout, "Warning: document reference count not 1 as expected, ref = %d\n", d->m_doc->refCount());
- if ( d->m_doc )
- d->m_doc->deref();
-
d->m_doc = 0;
delete d;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list