[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 05:55:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e92463724ab87906e973352c2d01a94551e10ad7
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 8 01:55:48 2002 +0000
More changes to IFLocationChangeHandler API.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e358eff..e63f264 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
2002-02-07 Richard Williamson <rjw at apple.com>
+ More changes to IFLocationChangeHandler API.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+
+2002-02-07 Richard Williamson <rjw at apple.com>
+
Factored URL loading code out and moved to IFBaseWebController.
* ChangeLog:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e358eff..e63f264 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
2002-02-07 Richard Williamson <rjw at apple.com>
+ More changes to IFLocationChangeHandler API.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+
+2002-02-07 Richard Williamson <rjw at apple.com>
+
Factored URL loading code out and moved to IFBaseWebController.
* ChangeLog:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e358eff..e63f264 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
2002-02-07 Richard Williamson <rjw at apple.com>
+ More changes to IFLocationChangeHandler API.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+
+2002-02-07 Richard Williamson <rjw at apple.com>
+
Factored URL loading code out and moved to IFBaseWebController.
* ChangeLog:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 9da6795..aafef69 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -79,6 +79,7 @@
- (IFWebFrame *)frame;
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)byMouseEvent;
- frameNamed: (NSString *)f;
- (void)_setParent: (IFWebDataSource *)p;
- (IFWebDataSource *)parent;
@@ -1304,7 +1305,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
controller = [dataSource controller];
if ([controller _changeLocationTo: url forFrame: frame parent: [[frame dataSource] parent]]){
- [[frame dataSource] startLoading: YES];
+ [[frame dataSource] _startLoading: YES initiatedByMouseEvent: YES];
}
/*
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 9da6795..aafef69 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -79,6 +79,7 @@
- (IFWebFrame *)frame;
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)byMouseEvent;
- frameNamed: (NSString *)f;
- (void)_setParent: (IFWebDataSource *)p;
- (IFWebDataSource *)parent;
@@ -1304,7 +1305,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
controller = [dataSource controller];
if ([controller _changeLocationTo: url forFrame: frame parent: [[frame dataSource] parent]]){
- [[frame dataSource] startLoading: YES];
+ [[frame dataSource] _startLoading: YES initiatedByMouseEvent: YES];
}
/*
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 9da6795..aafef69 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -79,6 +79,7 @@
- (IFWebFrame *)frame;
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)byMouseEvent;
- frameNamed: (NSString *)f;
- (void)_setParent: (IFWebDataSource *)p;
- (IFWebDataSource *)parent;
@@ -1304,7 +1305,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
controller = [dataSource controller];
if ([controller _changeLocationTo: url forFrame: frame parent: [[frame dataSource] parent]]){
- [[frame dataSource] startLoading: YES];
+ [[frame dataSource] _startLoading: YES initiatedByMouseEvent: YES];
}
/*
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5656242..4b355ab 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,16 @@
2002-02-07 Richard Williamson <rjw at apple.com>
+
+ More changes to IFLocationChangeHandler API.
+
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource startLoading:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
+ _startLoading:initiatedByMouseEvent:]):
+ * WebView.subproj/IFWebFramePrivate.h:
+
+2002-02-07 Richard Williamson <rjw at apple.com>
Update IFLocationChangeHandler API. Added factored code for
URL loading.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5656242..4b355ab 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,16 @@
2002-02-07 Richard Williamson <rjw at apple.com>
+
+ More changes to IFLocationChangeHandler API.
+
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource startLoading:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
+ _startLoading:initiatedByMouseEvent:]):
+ * WebView.subproj/IFWebFramePrivate.h:
+
+2002-02-07 Richard Williamson <rjw at apple.com>
Update IFLocationChangeHandler API. Added factored code for
URL loading.
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 781202f..7b47090 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -281,7 +281,7 @@
}
-- (void)locationChangeStartedForFrame: (IFWebFrame *)frame
+- (void)locationChangeStartedForFrame: (IFWebFrame *)frame initiatedByMouseEvent: (BOOL)flag;
{
// Do nothing.
}
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index a741373..2695a16 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -102,8 +102,10 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url forFrame: (IFWebFrame *)frame;
-- (void)locationChangeStartedForFrame: (IFWebFrame *)frame;
+- (void)locationChangeStartedForFrame: (IFWebFrame *)frame initiatedByMouseEvent: (BOOL)flag;
+
- (void)locationChangeCommittedForFrame: (IFWebFrame *)frame;
+
- (void)locationChangeDone: (IFError *)error forFrame: (IFWebFrame *)frame;
- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 080a64d..e0a51a8 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -214,12 +214,7 @@
// If forceRefresh is YES the document will load from the net, not the cache.
- (void)startLoading: (BOOL)forceRefresh
{
- KURL url = [[[self inputURL] absoluteString] cString];
-
- WEBKITDEBUG1 ("url = %s\n", [[[self inputURL] absoluteString] cString]);
- [self _part]->openURL (url);
-
- [[self controller] locationChangeStartedForFrame: [self frame]];
+ [self _startLoading: forceRefresh initiatedByMouseEvent: NO];
}
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 7865388..198b041 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -33,4 +33,5 @@
- (void)_setController: (id <IFWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setParent: (IFWebDataSource *)p;
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)flag;
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index d3ce900..71e6ac5 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -59,4 +59,13 @@
((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = [p retain];
}
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)byMouseEvent
+{
+ KURL url = [[[self inputURL] absoluteString] cString];
+
+ [self _part]->openURL (url);
+
+ [[self controller] locationChangeStartedForFrame: [self frame] initiatedByMouseEvent: byMouseEvent];
+}
+
@end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
new file mode 100644
index 0000000..a43ae5e
--- /dev/null
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -0,0 +1,30 @@
+/*
+ IFWebFramePrivate.h
+
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Private header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebDataSource.h>
+
+ at interface IFWebFramePrivate : NSObject
+{
+ NSString *name;
+ id view;
+ IFWebDataSource *dataSource;
+ void *renderFramePart;
+}
+
+- (void)setName: (NSString *)n;
+- (NSString *)name;
+- (void)setView: v;
+- view;
+- (void)setDataSource: (IFWebDataSource *)d;
+- (IFWebDataSource *)dataSource;
+- (void)setRenderFramePart: (void *)p;
+- (void *)renderFramePart;
+
+ at end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index a741373..2695a16 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -102,8 +102,10 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url forFrame: (IFWebFrame *)frame;
-- (void)locationChangeStartedForFrame: (IFWebFrame *)frame;
+- (void)locationChangeStartedForFrame: (IFWebFrame *)frame initiatedByMouseEvent: (BOOL)flag;
+
- (void)locationChangeCommittedForFrame: (IFWebFrame *)frame;
+
- (void)locationChangeDone: (IFError *)error forFrame: (IFWebFrame *)frame;
- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 080a64d..e0a51a8 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -214,12 +214,7 @@
// If forceRefresh is YES the document will load from the net, not the cache.
- (void)startLoading: (BOOL)forceRefresh
{
- KURL url = [[[self inputURL] absoluteString] cString];
-
- WEBKITDEBUG1 ("url = %s\n", [[[self inputURL] absoluteString] cString]);
- [self _part]->openURL (url);
-
- [[self controller] locationChangeStartedForFrame: [self frame]];
+ [self _startLoading: forceRefresh initiatedByMouseEvent: NO];
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 7865388..198b041 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -33,4 +33,5 @@
- (void)_setController: (id <IFWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setParent: (IFWebDataSource *)p;
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)flag;
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index d3ce900..71e6ac5 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -59,4 +59,13 @@
((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = [p retain];
}
+- (void)_startLoading: (BOOL)forceRefresh initiatedByMouseEvent: (BOOL)byMouseEvent
+{
+ KURL url = [[[self inputURL] absoluteString] cString];
+
+ [self _part]->openURL (url);
+
+ [[self controller] locationChangeStartedForFrame: [self frame] initiatedByMouseEvent: byMouseEvent];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
new file mode 100644
index 0000000..a43ae5e
--- /dev/null
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -0,0 +1,30 @@
+/*
+ IFWebFramePrivate.h
+
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Private header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebDataSource.h>
+
+ at interface IFWebFramePrivate : NSObject
+{
+ NSString *name;
+ id view;
+ IFWebDataSource *dataSource;
+ void *renderFramePart;
+}
+
+- (void)setName: (NSString *)n;
+- (NSString *)name;
+- (void)setView: v;
+- view;
+- (void)setDataSource: (IFWebDataSource *)d;
+- (IFWebDataSource *)dataSource;
+- (void)setRenderFramePart: (void *)p;
+- (void *)renderFramePart;
+
+ at end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index a741373..2695a16 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -102,8 +102,10 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url forFrame: (IFWebFrame *)frame;
-- (void)locationChangeStartedForFrame: (IFWebFrame *)frame;
+- (void)locationChangeStartedForFrame: (IFWebFrame *)frame initiatedByMouseEvent: (BOOL)flag;
+
- (void)locationChangeCommittedForFrame: (IFWebFrame *)frame;
+
- (void)locationChangeDone: (IFError *)error forFrame: (IFWebFrame *)frame;
- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list