[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:01:19 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 32b47f6ed44e6aa159b00447ccc41ce6216db97e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 3 14:33:30 2002 +0000

    	Fixed Radar 2893361 (Two frames with same name cause memory
    	trasher (likely double-free)) by implementing the mechanism KDE
    	uses to guarantee unique frame names.
    
    	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::frameExists): Actually
    	implement this, so that the khtml code can guarantee unique frame
    	names on each page.
    
    	* src/kwq/external.h: Prototype IFWebDataSource's frameExists:
    	method here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@949 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 368086e..09bcd1f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-04-03  Maciej Stachowiak  <mjs at apple.com>
 
+	Fixed Radar 2893361 (Two frames with same name cause memory
+	trasher (likely double-free)) by implementing the mechanism KDE
+	uses to guarantee unique frame names.
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::frameExists): Actually
+	implement this, so that the khtml code can guarantee unique frame
+	names on each page.
+
+	* src/kwq/external.h: Prototype IFWebDataSource's frameExists:
+	method here.
+
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
 	Fixed Radar 2893298 (KURL rejects spaces and other illegal but
 	unambiguous characters, leading to load failures).
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 368086e..09bcd1f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2002-04-03  Maciej Stachowiak  <mjs at apple.com>
 
+	Fixed Radar 2893361 (Two frames with same name cause memory
+	trasher (likely double-free)) by implementing the mechanism KDE
+	uses to guarantee unique frame names.
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::frameExists): Actually
+	implement this, so that the khtml code can guarantee unique frame
+	names on each page.
+
+	* src/kwq/external.h: Prototype IFWebDataSource's frameExists:
+	method here.
+
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
 	Fixed Radar 2893298 (KURL rejects spaces and other illegal but
 	unambiguous characters, leading to load failures).
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 368086e..09bcd1f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2002-04-03  Maciej Stachowiak  <mjs at apple.com>
 
+	Fixed Radar 2893361 (Two frames with same name cause memory
+	trasher (likely double-free)) by implementing the mechanism KDE
+	uses to guarantee unique frame names.
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::frameExists): Actually
+	implement this, so that the khtml code can guarantee unique frame
+	names on each page.
+
+	* src/kwq/external.h: Prototype IFWebDataSource's frameExists:
+	method here.
+
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
 	Fixed Radar 2893298 (KURL rejects spaces and other illegal but
 	unambiguous characters, leading to load failures).
 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index dc3b96a..3c5aefc 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1079,8 +1079,7 @@ KHTMLPart *KHTMLPart::findFrame( const QString &f )
 
 bool KHTMLPart::frameExists( const QString &frameName )
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [getDataSource() frameExists: (NSString *)frameName.getCFMutableString()];
 }
 
 KHTMLPart *KHTMLPart::parentPart()
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index dc3b96a..3c5aefc 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -1079,8 +1079,7 @@ KHTMLPart *KHTMLPart::findFrame( const QString &f )
 
 bool KHTMLPart::frameExists( const QString &frameName )
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [getDataSource() frameExists: (NSString *)frameName.getCFMutableString()];
 }
 
 KHTMLPart *KHTMLPart::parentPart()
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index aad80ec..79736aa 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -52,6 +52,7 @@
 - (IFWebFrame *)frame;
 - (id <IFWebController>)controller;
 - frameNamed: (NSString *)f;
+- (BOOL)frameExists: (NSString *)f;
 - (void)_setParent: (IFWebDataSource *)p;
 - (IFWebDataSource *)parent;
 - (void)_addURLHandle: (IFURLHandle *)handle;
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index dc3b96a..3c5aefc 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -1079,8 +1079,7 @@ KHTMLPart *KHTMLPart::findFrame( const QString &f )
 
 bool KHTMLPart::frameExists( const QString &frameName )
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [getDataSource() frameExists: (NSString *)frameName.getCFMutableString()];
 }
 
 KHTMLPart *KHTMLPart::parentPart()
diff --git a/WebCore/src/kwq/external.h b/WebCore/src/kwq/external.h
index aad80ec..79736aa 100644
--- a/WebCore/src/kwq/external.h
+++ b/WebCore/src/kwq/external.h
@@ -52,6 +52,7 @@
 - (IFWebFrame *)frame;
 - (id <IFWebController>)controller;
 - frameNamed: (NSString *)f;
+- (BOOL)frameExists: (NSString *)f;
 - (void)_setParent: (IFWebDataSource *)p;
 - (IFWebDataSource *)parent;
 - (void)_addURLHandle: (IFURLHandle *)handle;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list