[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:20:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3dbd233f6ae18c4e7d1b587d7a18434204f5b7bb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 17 01:48:53 2002 +0000
WebCore:
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
Fixed this function to get from frames to parts properly. It was still
assuming that [WebCoreBridge childFrames] would return a list of WebCoreBridge
objects, but now it returns WebCoreFrame objects.
* kwq/WebCoreFrame.h: Added [WebCoreFrame bridge] for the case above.
Note that it always gives the "committed" bridge, not the provisional one.
WebKit:
* WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame bridge]): Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1387 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6b5eb1a..82c1bb3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
2002-06-16 Darin Adler <darin at apple.com>
+ * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
+ Fixed this function to get from frames to parts properly. It was still
+ assuming that [WebCoreBridge childFrames] would return a list of WebCoreBridge
+ objects, but now it returns WebCoreFrame objects.
+
+ * kwq/WebCoreFrame.h: Added [WebCoreFrame bridge] for the case above.
+ Note that it always gives the "committed" bridge, not the provisional one.
+
+2002-06-16 Darin Adler <darin at apple.com>
+
Add a separate WebCoreFrame alongside WebCoreBridge to facilitate
handling of frames with no HTML content in them. This probably fixes
frames named "_blank".
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6b5eb1a..82c1bb3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2002-06-16 Darin Adler <darin at apple.com>
+ * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
+ Fixed this function to get from frames to parts properly. It was still
+ assuming that [WebCoreBridge childFrames] would return a list of WebCoreBridge
+ objects, but now it returns WebCoreFrame objects.
+
+ * kwq/WebCoreFrame.h: Added [WebCoreFrame bridge] for the case above.
+ Note that it always gives the "committed" bridge, not the provisional one.
+
+2002-06-16 Darin Adler <darin at apple.com>
+
Add a separate WebCoreFrame alongside WebCoreBridge to facilitate
handling of frames with no HTML content in them. This probably fixes
frames named "_blank".
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6b5eb1a..82c1bb3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2002-06-16 Darin Adler <darin at apple.com>
+ * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
+ Fixed this function to get from frames to parts properly. It was still
+ assuming that [WebCoreBridge childFrames] would return a list of WebCoreBridge
+ objects, but now it returns WebCoreFrame objects.
+
+ * kwq/WebCoreFrame.h: Added [WebCoreFrame bridge] for the case above.
+ Note that it always gives the "committed" bridge, not the provisional one.
+
+2002-06-16 Darin Adler <darin at apple.com>
+
Add a separate WebCoreFrame alongside WebCoreBridge to facilitate
handling of frames with no HTML content in them. This probably fixes
frames named "_blank".
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 8d0c688..d61a21d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -592,16 +592,15 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
- QPtrList<KParts::ReadOnlyPart> res;
- NSArray *children = [bridge childFrames];
- WebCoreBridge *childPart;
- unsigned int i;
-
- for (i = 0; i < [children count]; i++){
- childPart = [children objectAtIndex: i];
- res.append([childPart part]);
- }
- return res;
+ QPtrList<KParts::ReadOnlyPart> parts;
+ NSEnumerator *e = [[bridge childFrames] objectEnumerator];
+ id <WebCoreFrame> childFrame;
+ while ((childFrame = [e nextObject])) {
+ KHTMLPart *childPart = [[childFrame bridge] part];
+ if (childPart)
+ parts.append(childPart);
+ }
+ return parts;
}
QString KWQKHTMLPartImpl::documentSource() const
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 8d0c688..d61a21d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -592,16 +592,15 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
- QPtrList<KParts::ReadOnlyPart> res;
- NSArray *children = [bridge childFrames];
- WebCoreBridge *childPart;
- unsigned int i;
-
- for (i = 0; i < [children count]; i++){
- childPart = [children objectAtIndex: i];
- res.append([childPart part]);
- }
- return res;
+ QPtrList<KParts::ReadOnlyPart> parts;
+ NSEnumerator *e = [[bridge childFrames] objectEnumerator];
+ id <WebCoreFrame> childFrame;
+ while ((childFrame = [e nextObject])) {
+ KHTMLPart *childPart = [[childFrame bridge] part];
+ if (childPart)
+ parts.append(childPart);
+ }
+ return parts;
}
QString KWQKHTMLPartImpl::documentSource() const
diff --git a/WebCore/kwq/WebCoreFrame.h b/WebCore/kwq/WebCoreFrame.h
index d643360..a66f5a6 100644
--- a/WebCore/kwq/WebCoreFrame.h
+++ b/WebCore/kwq/WebCoreFrame.h
@@ -25,6 +25,8 @@
#import <Foundation/Foundation.h>
+ at class WebCoreBridge;
+
#ifdef __cplusplus
class KHTMLView;
#else
@@ -40,6 +42,8 @@ class KHTMLView;
- (void)loadURL:(NSURL *)URL;
- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
-- (KHTMLView *)widget;
+- (KHTMLView *)widget; // returns provisional widget if present, otherwise committed (avoid calling this for that reason)
+
+- (WebCoreBridge *)bridge; // always returns committed bridge, not provisional (avoid calling this for that reason)
@end
diff --git a/WebCore/kwq/WebCoreFrameBridge.h b/WebCore/kwq/WebCoreFrameBridge.h
index d643360..a66f5a6 100644
--- a/WebCore/kwq/WebCoreFrameBridge.h
+++ b/WebCore/kwq/WebCoreFrameBridge.h
@@ -25,6 +25,8 @@
#import <Foundation/Foundation.h>
+ at class WebCoreBridge;
+
#ifdef __cplusplus
class KHTMLView;
#else
@@ -40,6 +42,8 @@ class KHTMLView;
- (void)loadURL:(NSURL *)URL;
- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
-- (KHTMLView *)widget;
+- (KHTMLView *)widget; // returns provisional widget if present, otherwise committed (avoid calling this for that reason)
+
+- (WebCoreBridge *)bridge; // always returns committed bridge, not provisional (avoid calling this for that reason)
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94e8b2e..4d9ec21 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,9 @@
2002-06-16 Darin Adler <darin at apple.com>
+ * WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame bridge]): Added.
+
+2002-06-16 Darin Adler <darin at apple.com>
+
Add a separate WebCoreFrame alongside WebCoreBridge to facilitate
handling of frames with no HTML content in them. This probably fixes
frames named "_blank".
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 94e8b2e..4d9ec21 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
2002-06-16 Darin Adler <darin at apple.com>
+ * WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame bridge]): Added.
+
+2002-06-16 Darin Adler <darin at apple.com>
+
Add a separate WebCoreFrame alongside WebCoreBridge to facilitate
handling of frames with no HTML content in them. This probably fixes
frames named "_blank".
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
index 035da48..53dd2d6 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
@@ -11,6 +11,7 @@
#import <WebFoundation/IFURLCacheLoaderConstants.h>
#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/IFWebCoreBridge.h>
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebFrame.h>
#import <WebKit/IFWebView.h>
@@ -39,6 +40,11 @@
return [[self view] documentView];
}
+- (WebCoreBridge *)bridge
+{
+ return [[frame dataSource] _bridge];
+}
+
- (KHTMLView *)widget
{
WEBKIT_ASSERT([self HTMLView]);
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
index 035da48..53dd2d6 100644
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
@@ -11,6 +11,7 @@
#import <WebFoundation/IFURLCacheLoaderConstants.h>
#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/IFWebCoreBridge.h>
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebFrame.h>
#import <WebKit/IFWebView.h>
@@ -39,6 +40,11 @@
return [[self view] documentView];
}
+- (WebCoreBridge *)bridge
+{
+ return [[frame dataSource] _bridge];
+}
+
- (KHTMLView *)widget
{
WEBKIT_ASSERT([self HTMLView]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list