[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:26:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6fc5e90e0dc1c4b716fc41007db5295f28156b6e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 22 14:01:10 2002 +0000
WebCore:
Merged WebCoreBridge and WebCoreFrameBridge.
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::openURLInFrame): Use bridge, not frameBridge.
(KWQKHTMLPartImpl::urlSelected): Use bridge, not frameBridge.
(KWQKHTMLPartImpl::submitForm): Use bridge, not frameBridge.
(KWQKHTMLPartImpl::findFrame): Use bridge, not frameBridge.
(KWQKHTMLPartImpl::frames): Use bridge, not frameBridge.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge dealloc]): Free RenderPart if set.
(-[WebCoreBridge renderPart]): Moved here from WebFrameBridge.
(-[WebCoreBridge setRenderPart:]): Moved here from WebFrameBridge.
(-[WebCoreBridge copyRenderNode:khtml::copier:]): No more need to get render part from frame bridge.
(-[WebCoreBridge installInFrame:]): No more need to get render part from frame bridge.
* kwq/WebCoreFrameBridge.h: Removed.
* kwq/WebCoreFrameBridge.mm: Removed.
* WebCore.exp: Removed WebCoreFrameBridge.
* WebCore.pbproj/project.pbxproj: Removed WebCoreFrameBridge.
WebKit:
Merged WebBridge and WebFrameBridge.
* WebCoreSupport.subproj/WebBridge.h:
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge childFrames]): Return bridges, not frameBridges.
(-[WebBridge descendantFrameNamed:]): Return bridge, not frameBridge.
(-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return a bridge, not a frameBridge.
(-[WebBridge mainFrame]): Return a bridge, not a frameBridge.
(-[WebBridge frameNamed:]):Return a bridge, not a frameBridge.
(-[WebBridge loadURL:attributes:flags:withParent:]): Moved from WebFrameBridge.
(-[WebBridge loadURL:]): Moved from WebFrameBridge.
(-[WebBridge postWithURL:data:]): Moved from WebFrameBridge.
* WebCoreSupport.subproj/WebFrameBridge.h: Removed.
* WebCoreSupport.subproj/WebFrameBridge.m: Removed.
* WebView.subproj/WebFrame.m:
(-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Don't create
a WebFrameBridge.
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFramePrivate dealloc]): No longer dealloc frameBridge, since we don't have one.
(-[WebFrame _transitionToCommitted]): Pass along the frame's render part, if any.
(-[WebFrame _frameBridge]): Removed.
* WebKit.pbproj/project.pbxproj: Removed deleted files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1626 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9542515..9a9fdd9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,25 @@
+2002-07-22 Maciej Stachowiak <mjs at apple.com>
+
+ Merged WebCoreBridge and WebCoreFrameBridge.
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::urlSelected): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::submitForm): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::findFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::frames): Use bridge, not frameBridge.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge dealloc]): Free RenderPart if set.
+ (-[WebCoreBridge renderPart]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge setRenderPart:]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge copyRenderNode:khtml::copier:]): No more need to get render part from frame bridge.
+ (-[WebCoreBridge installInFrame:]): No more need to get render part from frame bridge.
+ * kwq/WebCoreFrameBridge.h: Removed.
+ * kwq/WebCoreFrameBridge.mm: Removed.
+ * WebCore.exp: Removed WebCoreFrameBridge.
+ * WebCore.pbproj/project.pbxproj: Removed WebCoreFrameBridge.
+
2002-07-21 Maciej Stachowiak <mjs at apple.com>
Removed provisional/committed distinction from WebCore and the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9542515..9a9fdd9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,25 @@
+2002-07-22 Maciej Stachowiak <mjs at apple.com>
+
+ Merged WebCoreBridge and WebCoreFrameBridge.
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::urlSelected): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::submitForm): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::findFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::frames): Use bridge, not frameBridge.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge dealloc]): Free RenderPart if set.
+ (-[WebCoreBridge renderPart]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge setRenderPart:]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge copyRenderNode:khtml::copier:]): No more need to get render part from frame bridge.
+ (-[WebCoreBridge installInFrame:]): No more need to get render part from frame bridge.
+ * kwq/WebCoreFrameBridge.h: Removed.
+ * kwq/WebCoreFrameBridge.mm: Removed.
+ * WebCore.exp: Removed WebCoreFrameBridge.
+ * WebCore.pbproj/project.pbxproj: Removed WebCoreFrameBridge.
+
2002-07-21 Maciej Stachowiak <mjs at apple.com>
Removed provisional/committed distinction from WebCore and the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9542515..9a9fdd9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,25 @@
+2002-07-22 Maciej Stachowiak <mjs at apple.com>
+
+ Merged WebCoreBridge and WebCoreFrameBridge.
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::urlSelected): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::submitForm): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::findFrame): Use bridge, not frameBridge.
+ (KWQKHTMLPartImpl::frames): Use bridge, not frameBridge.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge dealloc]): Free RenderPart if set.
+ (-[WebCoreBridge renderPart]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge setRenderPart:]): Moved here from WebFrameBridge.
+ (-[WebCoreBridge copyRenderNode:khtml::copier:]): No more need to get render part from frame bridge.
+ (-[WebCoreBridge installInFrame:]): No more need to get render part from frame bridge.
+ * kwq/WebCoreFrameBridge.h: Removed.
+ * kwq/WebCoreFrameBridge.mm: Removed.
+ * WebCore.exp: Removed WebCoreFrameBridge.
+ * WebCore.pbproj/project.pbxproj: Removed WebCoreFrameBridge.
+
2002-07-21 Maciej Stachowiak <mjs at apple.com>
Removed provisional/committed distinction from WebCore and the
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index 3f7674a..4550712 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -1,7 +1,6 @@
.objc_class_name_WebCoreBridge
.objc_class_name_WebCoreCache
.objc_class_name_WebCoreCookieAdapter
-.objc_class_name_WebCoreFrameBridge
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreTextRendererFactory
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index cc7760b..ae79c13 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -211,7 +211,6 @@
F58785D502DE375901EA4122,
F58785D902DE375901EA4122,
F58785DB02DE375901EA4122,
- F58785DD02DE375901EA4122,
F58785DE02DE375901EA4122,
F58785DF02DE375901EA4122,
F58785E002DE375901EA4122,
@@ -704,7 +703,6 @@
F523D31D02DE4476018635CA,
F523D31F02DE4476018635CA,
F523D32102DE4476018635CA,
- F52CA71002DFACBD018635CA,
F550D71002E132BB018635CA,
F5B2A4FF02E2220F018635CB,
F5B2A52E02E22573018635CB,
@@ -3545,17 +3543,6 @@
path = khtml/xml;
refType = 2;
};
- F52CA70F02DFACBD018635CA = {
- isa = PBXFileReference;
- path = WebCoreFrameBridge.mm;
- refType = 4;
- };
- F52CA71002DFACBD018635CA = {
- fileRef = F52CA70F02DFACBD018635CA;
- isa = PBXBuildFile;
- settings = {
- };
- };
F54A61D302E3523B01A80180 = {
isa = PBXFileReference;
path = KWQKHTMLPartImpl.cpp;
@@ -4249,11 +4236,6 @@
path = WebCoreCookieAdapter.m;
refType = 4;
};
- F587854B02DE375901EA4122 = {
- isa = PBXFileReference;
- path = WebCoreFrameBridge.h;
- refType = 4;
- };
F587854C02DE375901EA4122 = {
isa = PBXFileReference;
path = WebCoreFrameView.h;
@@ -5078,15 +5060,6 @@
settings = {
};
};
- F58785DD02DE375901EA4122 = {
- fileRef = F587854B02DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Private,
- );
- };
- };
F58785DE02DE375901EA4122 = {
fileRef = F587854C02DE375901EA4122;
isa = PBXBuildFile;
@@ -5192,8 +5165,6 @@
F5B2A4FD02E2220F018635CB,
F587854902DE375901EA4122,
F587854A02DE375901EA4122,
- F587854B02DE375901EA4122,
- F52CA70F02DFACBD018635CA,
F587854C02DE375901EA4122,
F587854D02DE375901EA4122,
F587854E02DE375901EA4122,
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 8e0758a..0ad6541 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -33,7 +33,6 @@
#import <khtmlview.h>
#import <WebCoreBridge.h>
-#import <WebCoreFrameBridge.h>
#import <WebCoreViewFactory.h>
#import <kwqdebug.h>
@@ -81,7 +80,7 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreFrameBridge *frame;
+ WebCoreBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
@@ -89,7 +88,7 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
frame = [bridge mainFrame];
}
} else {
- frame = [bridge frame];
+ frame = bridge;
}
[frame loadURL:url.getNSURL()];
@@ -382,7 +381,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
{
KURL clickedURL(part->completeURL( url));
KURL refLess(clickedURL);
- WebCoreFrameBridge *frame;
+ WebCoreBridge *frame;
if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
@@ -407,12 +406,11 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
if (_target.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
if ([[[bridge parent] childFrames] count] == 1) {
- frame = [[bridge parent] frame];
+ frame = [bridge parent];
} else {
- frame = [bridge frame];
+ frame = bridge;
}
- }
- else {
+ } else {
frame = [bridge descendantFrameNamed:_target.getNSString()];
if (frame == nil) {
NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2959902 is fixed.\n", _target.getNSString());
@@ -533,7 +531,7 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
if ( strcmp( action, "get" ) == 0 )
{
u.setQuery( QString( formData.data(), formData.size() ) );
- [[bridge frame] loadURL:u.getNSURL()];
+ [bridge loadURL:u.getNSURL()];
#ifdef NEED_THIS
args.frameName = target;
@@ -554,7 +552,7 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
args.setContentType( "Content-Type: " + contentType + "; boundary=" + boundary );
#endif
NSData *postData = [NSData dataWithBytes:formData.data() length:formData.size()];
- [[bridge frame] postWithURL:u.getNSURL() data:postData];
+ [bridge postWithURL:u.getNSURL() data:postData];
}
#ifdef NEED_THIS
@@ -583,16 +581,16 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
+ return [[bridge frameNamed:frameName.getNSString()] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
QPtrList<KParts::ReadOnlyPart> parts;
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
- WebCoreFrameBridge *childFrame;
+ WebCoreBridge *childFrame;
while ((childFrame = [e nextObject])) {
- KHTMLPart *childPart = [[childFrame bridge] part];
+ KHTMLPart *childPart = [childFrame part];
if (childPart)
parts.append(childPart);
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 8e0758a..0ad6541 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -33,7 +33,6 @@
#import <khtmlview.h>
#import <WebCoreBridge.h>
-#import <WebCoreFrameBridge.h>
#import <WebCoreViewFactory.h>
#import <kwqdebug.h>
@@ -81,7 +80,7 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreFrameBridge *frame;
+ WebCoreBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
@@ -89,7 +88,7 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
frame = [bridge mainFrame];
}
} else {
- frame = [bridge frame];
+ frame = bridge;
}
[frame loadURL:url.getNSURL()];
@@ -382,7 +381,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
{
KURL clickedURL(part->completeURL( url));
KURL refLess(clickedURL);
- WebCoreFrameBridge *frame;
+ WebCoreBridge *frame;
if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
@@ -407,12 +406,11 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
if (_target.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
if ([[[bridge parent] childFrames] count] == 1) {
- frame = [[bridge parent] frame];
+ frame = [bridge parent];
} else {
- frame = [bridge frame];
+ frame = bridge;
}
- }
- else {
+ } else {
frame = [bridge descendantFrameNamed:_target.getNSString()];
if (frame == nil) {
NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2959902 is fixed.\n", _target.getNSString());
@@ -533,7 +531,7 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
if ( strcmp( action, "get" ) == 0 )
{
u.setQuery( QString( formData.data(), formData.size() ) );
- [[bridge frame] loadURL:u.getNSURL()];
+ [bridge loadURL:u.getNSURL()];
#ifdef NEED_THIS
args.frameName = target;
@@ -554,7 +552,7 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
args.setContentType( "Content-Type: " + contentType + "; boundary=" + boundary );
#endif
NSData *postData = [NSData dataWithBytes:formData.data() length:formData.size()];
- [[bridge frame] postWithURL:u.getNSURL() data:postData];
+ [bridge postWithURL:u.getNSURL() data:postData];
}
#ifdef NEED_THIS
@@ -583,16 +581,16 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
+ return [[bridge frameNamed:frameName.getNSString()] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
QPtrList<KParts::ReadOnlyPart> parts;
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
- WebCoreFrameBridge *childFrame;
+ WebCoreBridge *childFrame;
while ((childFrame = [e nextObject])) {
- KHTMLPart *childPart = [[childFrame bridge] part];
+ KHTMLPart *childPart = [childFrame part];
if (childPart)
parts.append(childPart);
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 150479f..9163c49 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -47,8 +47,6 @@ typedef khtml::RenderPart KHTMLRenderPart;
@class WebError;
@class WebResourceHandle;
- at class WebCoreFrameBridge;
-
@protocol WebCoreDOMTreeCopier;
@protocol WebCoreRenderTreeCopier;
@protocol WebCoreResourceLoader;
@@ -65,9 +63,13 @@ typedef khtml::RenderPart KHTMLRenderPart;
@interface WebCoreBridge : NSObject
{
KHTMLPart *part;
+ KHTMLRenderPart *renderPart;
BOOL bridgeOwnsKHTMLView;
}
+- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
+- (KHTMLRenderPart *)renderPart;
+
- (KHTMLPart *)part;
- (void)openURL:(NSURL *)URL;
@@ -114,12 +116,14 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (WebCoreBridge *)parent;
-- (WebCoreFrameBridge *)frame;
-- (NSArray *)childFrames; // WebCoreFrameBridge objects
-- (WebCoreFrameBridge *)descendantFrameNamed:(NSString *)name;
+- (NSArray *)childFrames; // WebCoreBridge objects
+- (WebCoreBridge *)descendantFrameNamed:(NSString *)name;
+
+- (WebCoreBridge *)mainFrame;
+- (WebCoreBridge *)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
-- (WebCoreFrameBridge *)mainFrame;
-- (WebCoreFrameBridge *)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
+- (void)loadURL:(NSURL *)URL;
+- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
- (void)setTitle:(NSString *)title;
- (void)setStatusText:(NSString *)status;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 5cb381e..3ebe8e8 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -25,8 +25,6 @@
#import <WebCoreBridge.h>
-#import <WebCoreFrameBridge.h>
-
#import <khtml_part.h>
#import <khtmlview.h>
#import <dom_docimpl.h>
@@ -52,6 +50,9 @@
{
[self removeFromFrame];
+ if (renderPart) {
+ renderPart->deref();
+ }
part->deref();
[super dealloc];
@@ -62,6 +63,21 @@
return part;
}
+- (void)setRenderPart:(KHTMLRenderPart *)newPart;
+{
+ newPart->ref();
+ if (renderPart) {
+ renderPart->deref();
+ }
+ renderPart = newPart;
+}
+
+- (KHTMLRenderPart *)renderPart
+{
+ return renderPart;
+}
+
+
- (void)openURL:(NSURL *)URL
{
part->openURL([[URL absoluteString] cString]);
@@ -222,8 +238,8 @@
NSString *name = [[NSString alloc] initWithUTF8String:node->renderName()];
- khtml::RenderPart *renderPart = dynamic_cast<khtml::RenderPart *>(node);
- QWidget *widget = renderPart ? renderPart->widget() : 0;
+ khtml::RenderPart *nodeRenderPart = dynamic_cast<khtml::RenderPart *>(node);
+ QWidget *widget = nodeRenderPart ? nodeRenderPart->widget() : 0;
NSView *view = widget ? widget->getView() : nil;
NSObject *copiedNode = [copier nodeWithName:name
@@ -262,11 +278,9 @@
{
part->impl->getView()->setView(view);
- KHTMLRenderPart *renderPart = [[self frame] renderPart];
-
// If this isn't the main frame, it must have a render part set, or it
// won't ever get installed in the view hierarchy.
- KWQ_ASSERT([self frame] == [self mainFrame] || renderPart != nil);
+ KWQ_ASSERT(self == [self mainFrame] || renderPart != nil);
if (renderPart) {
renderPart->setWidget(part->impl->getView());
diff --git a/WebCore/kwq/WebCoreFrameBridge.h b/WebCore/kwq/WebCoreFrameBridge.h
deleted file mode 100644
index 955290b..0000000
--- a/WebCore/kwq/WebCoreFrameBridge.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebCore/WebCoreBridge.h>
-
-// The main difference between a WebCoreFrameBridge and a WebCoreBridge
-// is that there's no guarantee a WebCoreFrameBridge will have any HTML in
-// it, thus no guarantee that it will have a KHTMLPart.
-
-// The WebCoreFrameBridge interface contains methods for use by the non-WebCore side of the bridge.
-
- at interface WebCoreFrameBridge : NSObject
-{
- KHTMLRenderPart *renderPart;
-}
-
-- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
-- (KHTMLRenderPart *)renderPart;
-
- at end
-
-// The WebCoreFrameBridge protocol contains methods for use by the WebCore side of the bridge.
-
- at protocol WebCoreFrameBridge
-
-- (void)loadURL:(NSURL *)URL;
-- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
-
-- (WebCoreBridge *)bridge;
-
- at end
-
-// This interface definition allows those who hold a WebCoreFrameBridge * to call all the methods
-// in the WebCoreBridge protocol without requiring the base implementation to supply the methods.
-// This idiom is appropriate because WebCoreFrameBridge is an abstract class.
-
- at interface WebCoreFrameBridge (SubclassResponsibility) <WebCoreFrameBridge>
- at end
diff --git a/WebCore/kwq/WebCoreFrameBridge.mm b/WebCore/kwq/WebCoreFrameBridge.mm
deleted file mode 100644
index f671393..0000000
--- a/WebCore/kwq/WebCoreFrameBridge.mm
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// WebCoreFrameBridge.m
-// WebCore
-//
-// Created by Darin Adler on Fri Jul 12 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "WebCoreFrameBridge.h"
-
-#import <render_frames.h>
-
- at implementation WebCoreFrameBridge
-
-- (void)dealloc
-{
- if (renderPart) {
- renderPart->deref();
- }
- [super dealloc];
-}
-
-- (void)setRenderPart:(KHTMLRenderPart *)newPart;
-{
- newPart->ref();
- if (renderPart) {
- renderPart->deref();
- }
- renderPart = newPart;
-}
-
-- (KHTMLRenderPart *)renderPart
-{
- return renderPart;
-}
-
- at end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0097b77..6ab19b3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,31 @@
2002-07-22 Maciej Stachowiak <mjs at apple.com>
+ Merged WebBridge and WebFrameBridge.
+
+ * WebCoreSupport.subproj/WebBridge.h:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge childFrames]): Return bridges, not frameBridges.
+ (-[WebBridge descendantFrameNamed:]): Return bridge, not frameBridge.
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return a bridge, not a frameBridge.
+ (-[WebBridge mainFrame]): Return a bridge, not a frameBridge.
+ (-[WebBridge frameNamed:]):Return a bridge, not a frameBridge.
+ (-[WebBridge loadURL:attributes:flags:withParent:]): Moved from WebFrameBridge.
+ (-[WebBridge loadURL:]): Moved from WebFrameBridge.
+ (-[WebBridge postWithURL:data:]): Moved from WebFrameBridge.
+ * WebCoreSupport.subproj/WebFrameBridge.h: Removed.
+ * WebCoreSupport.subproj/WebFrameBridge.m: Removed.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Don't create
+ a WebFrameBridge.
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate dealloc]): No longer dealloc frameBridge, since we don't have one.
+ (-[WebFrame _transitionToCommitted]): Pass along the frame's render part, if any.
+ (-[WebFrame _frameBridge]): Removed.
+ * WebKit.pbproj/project.pbxproj: Removed deleted files.
+
+2002-07-22 Maciej Stachowiak <mjs at apple.com>
+
Change WebBridge to hold on to a WebFrame instead of a
WebDataSource. Since we will no longer ever have a bridge for a
provisional data source, we'll just bind the bridge to a
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0097b77..6ab19b3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,31 @@
2002-07-22 Maciej Stachowiak <mjs at apple.com>
+ Merged WebBridge and WebFrameBridge.
+
+ * WebCoreSupport.subproj/WebBridge.h:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge childFrames]): Return bridges, not frameBridges.
+ (-[WebBridge descendantFrameNamed:]): Return bridge, not frameBridge.
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return a bridge, not a frameBridge.
+ (-[WebBridge mainFrame]): Return a bridge, not a frameBridge.
+ (-[WebBridge frameNamed:]):Return a bridge, not a frameBridge.
+ (-[WebBridge loadURL:attributes:flags:withParent:]): Moved from WebFrameBridge.
+ (-[WebBridge loadURL:]): Moved from WebFrameBridge.
+ (-[WebBridge postWithURL:data:]): Moved from WebFrameBridge.
+ * WebCoreSupport.subproj/WebFrameBridge.h: Removed.
+ * WebCoreSupport.subproj/WebFrameBridge.m: Removed.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]): Don't create
+ a WebFrameBridge.
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFramePrivate dealloc]): No longer dealloc frameBridge, since we don't have one.
+ (-[WebFrame _transitionToCommitted]): Pass along the frame's render part, if any.
+ (-[WebFrame _frameBridge]): Removed.
+ * WebKit.pbproj/project.pbxproj: Removed deleted files.
+
+2002-07-22 Maciej Stachowiak <mjs at apple.com>
+
Change WebBridge to hold on to a WebFrame instead of a
WebDataSource. Since we will no longer ever have a bridge for a
provisional data source, we'll just bind the bridge to a
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.h b/WebKit/WebCoreSupport.subproj/WebBridge.h
index 7a39ca7..bbdeed0 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.h
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.h
@@ -19,8 +19,9 @@
- (void)setFrame:(WebFrame *)webFrame;
- (void)dataSourceChanged;
-
- (WebDataSource *)dataSource;
+- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent;
+
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 44363f7..bfde907 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -9,7 +9,6 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -39,12 +38,6 @@
[super dealloc];
}
-- (WebCoreFrameBridge *)frame
-{
- WEBKIT_ASSERT(frame != nil);
- return [frame _frameBridge];
-}
-
- (WebCoreBridge *)parent
{
return [[[self dataSource] parent] _bridge];
@@ -57,21 +50,21 @@
NSMutableArray *frameBridges = [NSMutableArray arrayWithCapacity:[frames count]];
WebFrame *childFrame;
while ((childFrame = [e nextObject])) {
- id frameBridge = [childFrame _frameBridge];
+ id frameBridge = [childFrame _bridge];
if (frameBridge)
[frameBridges addObject:frameBridge];
}
return frameBridges;
}
-- (WebCoreFrameBridge *)descendantFrameNamed:(NSString *)name
+- (WebCoreBridge *)descendantFrameNamed:(NSString *)name
{
WEBKIT_ASSERT(frame != nil);
- return [[frame frameNamed:name] _frameBridge];
+ return [[frame frameNamed:name] _bridge];
}
- (BOOL)createChildFrameNamed:(NSString *)frameName
- withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)renderPart
+ withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)childRenderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
{
WEBKIT_ASSERT(frame != nil);
@@ -80,12 +73,12 @@
return NO;
}
- [[newFrame _frameBridge] setRenderPart:renderPart];
+ [[newFrame _bridge] setRenderPart:childRenderPart];
[[newFrame webView] _setMarginWidth:width];
[[newFrame webView] _setMarginHeight:height];
- [[newFrame _frameBridge] loadURL:URL attributes:nil flags:0 withParent:[self dataSource]];
+ [[newFrame _bridge] loadURL:URL attributes:nil flags:0 withParent:[self dataSource]];
return YES;
}
@@ -159,16 +152,16 @@
[[[frame controller] windowContext] setStatusText:status];
}
-- (WebCoreFrameBridge *)mainFrame
+- (WebCoreBridge *)mainFrame
{
WEBKIT_ASSERT(frame != nil);
- return [[[frame controller] mainFrame] _frameBridge];
+ return [[[frame controller] mainFrame] _bridge];
}
-- (WebCoreFrameBridge *)frameNamed:(NSString *)name
+- (WebCoreBridge *)frameNamed:(NSString *)name
{
WEBKIT_ASSERT(frame != nil);
- return [[[frame controller] frameNamed:name] _frameBridge];
+ return [[[frame controller] frameNamed:name] _bridge];
}
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)withDataSource
@@ -273,4 +266,33 @@
[[self dataSource] _setIconURL:url withType:type];
}
+- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent
+{
+ WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
+ [newDataSource _setParent:parent];
+ if ([frame setProvisionalDataSource:newDataSource]) {
+ [frame startLoading];
+ }
+ [newDataSource release];
+}
+
+- (void)loadURL:(NSURL *)URL
+{
+ [self loadURL:URL attributes:nil flags:0 withParent:[[frame dataSource] parent]];
+}
+
+- (void)postWithURL:(NSURL *)URL data:(NSData *)data
+{
+ // When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
+ // This prevents a potential bug which may cause a page
+ // with a form that uses itself as an action to be returned
+ // from the cache without submitting.
+ NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:
+ data, WebHTTPResourceHandleRequestData,
+ @"POST", WebHTTPResourceHandleRequestMethod,
+ nil];
+ [self loadURL:URL attributes:attributes flags:WebResourceHandleFlagLoadFromOrigin withParent:[[frame dataSource] parent]];
+ [attributes release];
+}
+
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.h b/WebKit/WebCoreSupport.subproj/WebFrameBridge.h
deleted file mode 100644
index 2f33da2..0000000
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// WebFrameBridge.h
-// WebKit
-//
-// Created by Darin Adler on Sun Jun 16 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreFrameBridge.h>
-
- at class WebDataSource;
- at class WebFrame;
-
- at interface WebFrameBridge : WebCoreFrameBridge <WebCoreFrameBridge>
-{
- WebFrame *frame;
-}
-
-- initWithWebFrame:(WebFrame *)frame;
-
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
deleted file mode 100644
index e6816ae..0000000
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// WebFrameBridge.m
-// WebKit
-//
-// Created by Darin Adler on Sun Jun 16 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WebFrameBridge.h>
-
-#import <WebFoundation/WebCacheLoaderConstants.h>
-
-#import <WebKit/WebHTMLViewPrivate.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebView.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation WebFrameBridge
-
-// owned by the WebFrame
-
-- initWithWebFrame:(WebFrame *)f
-{
- [super init];
-
- frame = f; // don't retain
-
- return self;
-}
-
-- (WebView *)view
-{
- return [frame webView];
-}
-
-- (WebHTMLView *)HTMLView
-{
- return (WebHTMLView *)[[self view] documentView];
-}
-
-- (WebCoreBridge *)bridge
-{
- return [[frame dataSource] _bridge];
-}
-
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent
-{
- WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
- [newDataSource _setParent:parent];
- if ([frame setProvisionalDataSource:newDataSource]) {
- [frame startLoading];
- }
- [newDataSource release];
-}
-
-- (void)loadURL:(NSURL *)URL
-{
- [self loadURL:URL attributes:nil flags:0 withParent:[[frame dataSource] parent]];
-}
-
-- (void)postWithURL:(NSURL *)URL data:(NSData *)data
-{
- // When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
- // This prevents a potential bug which may cause a page
- // with a form that uses itself as an action to be returned
- // from the cache without submitting.
- NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:
- data, WebHTTPResourceHandleRequestData,
- @"POST", WebHTTPResourceHandleRequestMethod,
- nil];
- [self loadURL:URL attributes:attributes flags:WebResourceHandleFlagLoadFromOrigin withParent:[[frame dataSource] parent]];
- [attributes release];
-}
-
- at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c72f017..19a934e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -253,7 +253,6 @@
F5E0A77002B8FEE401C1A525,
F5A55DC802BAA2E8018635CC,
F5E0E10A02BC45F8018635CA,
- F5A7B11B02BC8413018635CA,
F5488CF602CB04EE01FF6274,
F5927D4B02D253C401CA2DBB,
F5927D4F02D26C5E01CA2DBB,
@@ -336,7 +335,6 @@
F5AFB46102B94DC8018635CA,
F5E0A77102B8FEE401C1A525,
F5E0E10B02BC45F8018635CA,
- F5A7B11C02BC8413018635CA,
F5488CF702CB04EE01FF6274,
F508472502DED36E01257167,
F53444D102E87CBA018635CA,
@@ -1757,30 +1755,6 @@
settings = {
};
};
- F5A7B11902BC8413018635CA = {
- isa = PBXFileReference;
- name = WebFrameBridge.h;
- path = WebCoreSupport.subproj/WebFrameBridge.h;
- refType = 2;
- };
- F5A7B11A02BC8413018635CA = {
- isa = PBXFileReference;
- name = WebFrameBridge.m;
- path = WebCoreSupport.subproj/WebFrameBridge.m;
- refType = 2;
- };
- F5A7B11B02BC8413018635CA = {
- fileRef = F5A7B11902BC8413018635CA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F5A7B11C02BC8413018635CA = {
- fileRef = F5A7B11A02BC8413018635CA;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5AEBB3D024A527601C1A526 = {
isa = PBXFileReference;
path = WebPreferences.m;
@@ -1832,8 +1806,6 @@
F5AFB45F02B94DC8018635CA,
F5E0E10802BC45F8018635CA,
F5E0E10902BC45F8018635CA,
- F5A7B11902BC8413018635CA,
- F5A7B11A02BC8413018635CA,
F5488CF402CB04EE01FF6274,
F5488CF502CB04EE01FF6274,
);
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 982e034..7e2a36b 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -11,7 +11,6 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -31,7 +30,6 @@
[super init];
_private = [[WebFramePrivate alloc] init];
- _private->frameBridge = [[WebFrameBridge alloc] initWithWebFrame:self];
[self _setState: WebFrameStateUninitialized];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 752a7e8..0b12485 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -44,7 +44,6 @@ typedef enum {
WebController *controller;
WebFrameState state;
NSTimer *scheduledLayoutTimer;
- WebFrameBridge *frameBridge;
}
- (void)setName: (NSString *)n;
@@ -73,7 +72,6 @@ typedef enum {
- (void)_checkLoadComplete;
- (void)_timedLayout: userInfo;
- (WebBridge *)_bridge;
-- (WebFrameBridge *)_frameBridge;
- (BOOL)_shouldShowDataSource:(WebDataSource *)dataSource;
- (void)_setProvisionalDataSource:(WebDataSource *)d;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index e1c4093..d9e85e0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -15,7 +15,6 @@
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebFrameBridge.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitErrors.h>
@@ -50,7 +49,6 @@ static const char * const stateNames[6] = {
[webView release];
[dataSource release];
[provisionalDataSource release];
- [frameBridge release];
[super dealloc];
}
@@ -231,6 +229,10 @@ static const char * const stateNames[6] = {
// a bridge without the need for a dummy data source
WEBKIT_ASSERT (documentView != nil || [self webView] == nil);
+ if ([[_private->dataSource _bridge] renderPart] != nil) {
+ [[_private->provisionalDataSource _bridge] setRenderPart:[[_private->dataSource _bridge] renderPart]];
+ }
+
// Set the committed data source on the frame.
[self _setDataSource: _private->provisionalDataSource];
@@ -448,11 +450,6 @@ static const char * const stateNames[6] = {
return [[self dataSource] _bridge];
}
-- (WebFrameBridge *)_frameBridge
-{
- return _private->frameBridge;
-}
-
- (BOOL)_shouldShowDataSource:(WebDataSource *)dataSource
{
id <WebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list