[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:34:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ff48f350962f97d9c374f0b2fbcd182a356f51ca
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 26 21:33:05 2002 +0000
Add machinery for deferring callbacks. Not used yet.
* WebView.subproj/WebControllerPrivate.h: Add methods.
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _defersCallbacks]): Returns old state.
(-[WebController _setDefersCallbacks:]): Changes state and calls _defersCallbacksChanged
on the main frame.
* WebView.subproj/WebFramePrivate.h: Add _defersCallbacksChanged.
* WebView.subproj/WebFramePrivate.m: (-[WebFrame _defersCallbacksChanged]):
Calls _defersCallbacksChanged on both data sources.
* WebView.subproj/WebDataSourcePrivate.h: Add _defersCallbacksChanged.
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setController:]): Call _defersCallbacksChanged if changing the controller
changes the state.
(-[WebDataSource _addResourceHandle:]): Call setDefersCallbacks:YES on the new handle if
we are already attached to a controller that defers callbacks.
(-[WebDataSource _defersCallbacksChanged]): Call setDefersCallbacks on all the handles, and
call _defersCallbacksChanged on the child frames as well.
* WebView.subproj/WebDataSource.m: (-[WebDataSource controller]):
We need to know about all controller changes, so it's unacceptable to consult our
parent about the controller. But we already do know about it and this code was unnecessary.
Leave the old code around as an assert only.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 197082f..5898c01 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,32 @@
-2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+2002-08-26 Darin Adler <darin at apple.com>
+
+ Add machinery for deferring callbacks. Not used yet.
+
+ * WebView.subproj/WebControllerPrivate.h: Add methods.
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _defersCallbacks]): Returns old state.
+ (-[WebController _setDefersCallbacks:]): Changes state and calls _defersCallbacksChanged
+ on the main frame.
+
+ * WebView.subproj/WebFramePrivate.h: Add _defersCallbacksChanged.
+ * WebView.subproj/WebFramePrivate.m: (-[WebFrame _defersCallbacksChanged]):
+ Calls _defersCallbacksChanged on both data sources.
+
+ * WebView.subproj/WebDataSourcePrivate.h: Add _defersCallbacksChanged.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setController:]): Call _defersCallbacksChanged if changing the controller
+ changes the state.
+ (-[WebDataSource _addResourceHandle:]): Call setDefersCallbacks:YES on the new handle if
+ we are already attached to a controller that defers callbacks.
+ (-[WebDataSource _defersCallbacksChanged]): Call setDefersCallbacks on all the handles, and
+ call _defersCallbacksChanged on the child frames as well.
+
+ * WebView.subproj/WebDataSource.m: (-[WebDataSource controller]):
+ We need to know about all controller changes, so it's unacceptable to consult our
+ parent about the controller. But we already do know about it and this code was unnecessary.
+ Leave the old code around as an assert only.
+
+2002-08-26 Richard Williamson <rjw at apple.com>
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
@@ -34,7 +62,7 @@
It would be better to do this at some other level, but without this code, we end
up leaving the entire KHTMLView behind when we switch to a non-HTML page.
-2002-08-22 Richard Williamson (Local) <rjw at apple.com>
+2002-08-22 Richard Williamson <rjw at apple.com>
Changed public string from #define to extern NSString.
@@ -72,7 +100,7 @@
=== Alexander-20 ===
-2002-08-21 Richard Williamson (Local) <rjw at apple.com>
+2002-08-21 Richard Williamson <rjw at apple.com>
Simple name change. Plugin -> NetscapePlugin in anticipation
of other plugin related API.
@@ -669,7 +697,7 @@
(-[WebPreferences defaultTextEncoding]): Likewise.
(-[WebPreferences setDefaultTextEncoding:]): Likewise.
-2002-08-08 Richard Williamson (Home) <rjw at apple.com>
+2002-08-08 Richard Williamson <rjw at apple.com>
Changes to coalesce all drawing calls of the same text
style and color into one call to CG. Significantly
@@ -742,7 +770,7 @@
* WebView.subproj/WebView.m:
(-[WebView keyDown:]): Check for shift-delete.
-2002-08-07 Richard Williamson (Home) <rjw at apple.com>
+2002-08-07 Richard Williamson <rjw at apple.com>
Fixed scrollview related drawing turd problems.
(3000844 and 2896459).
@@ -935,7 +963,7 @@
(-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
* WebView.subproj/WebDataSourcePrivate.m:
-2002-08-05 Richard Williamson (Home) <rjw at apple.com>
+2002-08-05 Richard Williamson <rjw at apple.com>
Added additional check to find appropriate fonts with available
weight, rather than always using a weight of 5.
@@ -957,7 +985,7 @@
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge setTitle:]): Call _web_stringByCollapsingNonPrintingCharacters.
-2002-08-05 Richard Williamson (Home) <rjw at apple.com>
+2002-08-05 Richard Williamson <rjw at apple.com>
Added exported symbols file.
@@ -1049,7 +1077,7 @@
(-[WebView keyDown:]):
Added checks for command key.
-2002-08-01 Richard Williamson (Local) <rjw at apple.com>
+2002-08-01 Richard Williamson <rjw at apple.com>
Effort towards 3014555 (going back to frame), but not fixed.
Need to think more about appropriate solution and compromises.
@@ -1100,7 +1128,7 @@
* Plugins.subproj/WebPluginView.m:
(-[WebPluginView performKeyEquivalent:]):
-2002-08-01 Richard Williamson (Local) <rjw at apple.com>
+2002-08-01 Richard Williamson <rjw at apple.com>
More back/forward work. Support for restoring scroll position.
We still have a big remaining issue. We don't record the entire
@@ -1249,7 +1277,7 @@
it would be a mistake to get a redirect after having received
data.
-2002-07-30 Richard Williamson (local) <rjw at apple.com>
+2002-07-30 Richard Williamson <rjw at apple.com>
Remove annoying log, it's really annoying. Added FIX ME
comment instead.
@@ -1426,7 +1454,7 @@
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _mainHandle]): added, WebPluginStream needs this
-2002-07-25 Richard Williamson (Local) <rjw at apple.com>
+2002-07-25 Richard Williamson <rjw at apple.com>
More incremental changes for back/forward migration.
@@ -1631,7 +1659,7 @@
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView menuForEvent:]):
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Removed vestigal locationChangeHandler ivar.
@@ -1646,7 +1674,7 @@
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource receivedPageIcon:]):
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Implemented find for text views.
@@ -1730,7 +1758,7 @@
Renamed minimumFont to defaultFont, and changed it from 11 to 16.
Also changed default monospaced font to Courier instead of Monaco.
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Support for find in HTML, find in text view coming soon.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 197082f..5898c01 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,32 @@
-2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+2002-08-26 Darin Adler <darin at apple.com>
+
+ Add machinery for deferring callbacks. Not used yet.
+
+ * WebView.subproj/WebControllerPrivate.h: Add methods.
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _defersCallbacks]): Returns old state.
+ (-[WebController _setDefersCallbacks:]): Changes state and calls _defersCallbacksChanged
+ on the main frame.
+
+ * WebView.subproj/WebFramePrivate.h: Add _defersCallbacksChanged.
+ * WebView.subproj/WebFramePrivate.m: (-[WebFrame _defersCallbacksChanged]):
+ Calls _defersCallbacksChanged on both data sources.
+
+ * WebView.subproj/WebDataSourcePrivate.h: Add _defersCallbacksChanged.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setController:]): Call _defersCallbacksChanged if changing the controller
+ changes the state.
+ (-[WebDataSource _addResourceHandle:]): Call setDefersCallbacks:YES on the new handle if
+ we are already attached to a controller that defers callbacks.
+ (-[WebDataSource _defersCallbacksChanged]): Call setDefersCallbacks on all the handles, and
+ call _defersCallbacksChanged on the child frames as well.
+
+ * WebView.subproj/WebDataSource.m: (-[WebDataSource controller]):
+ We need to know about all controller changes, so it's unacceptable to consult our
+ parent about the controller. But we already do know about it and this code was unnecessary.
+ Leave the old code around as an assert only.
+
+2002-08-26 Richard Williamson <rjw at apple.com>
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
@@ -34,7 +62,7 @@
It would be better to do this at some other level, but without this code, we end
up leaving the entire KHTMLView behind when we switch to a non-HTML page.
-2002-08-22 Richard Williamson (Local) <rjw at apple.com>
+2002-08-22 Richard Williamson <rjw at apple.com>
Changed public string from #define to extern NSString.
@@ -72,7 +100,7 @@
=== Alexander-20 ===
-2002-08-21 Richard Williamson (Local) <rjw at apple.com>
+2002-08-21 Richard Williamson <rjw at apple.com>
Simple name change. Plugin -> NetscapePlugin in anticipation
of other plugin related API.
@@ -669,7 +697,7 @@
(-[WebPreferences defaultTextEncoding]): Likewise.
(-[WebPreferences setDefaultTextEncoding:]): Likewise.
-2002-08-08 Richard Williamson (Home) <rjw at apple.com>
+2002-08-08 Richard Williamson <rjw at apple.com>
Changes to coalesce all drawing calls of the same text
style and color into one call to CG. Significantly
@@ -742,7 +770,7 @@
* WebView.subproj/WebView.m:
(-[WebView keyDown:]): Check for shift-delete.
-2002-08-07 Richard Williamson (Home) <rjw at apple.com>
+2002-08-07 Richard Williamson <rjw at apple.com>
Fixed scrollview related drawing turd problems.
(3000844 and 2896459).
@@ -935,7 +963,7 @@
(-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
* WebView.subproj/WebDataSourcePrivate.m:
-2002-08-05 Richard Williamson (Home) <rjw at apple.com>
+2002-08-05 Richard Williamson <rjw at apple.com>
Added additional check to find appropriate fonts with available
weight, rather than always using a weight of 5.
@@ -957,7 +985,7 @@
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge setTitle:]): Call _web_stringByCollapsingNonPrintingCharacters.
-2002-08-05 Richard Williamson (Home) <rjw at apple.com>
+2002-08-05 Richard Williamson <rjw at apple.com>
Added exported symbols file.
@@ -1049,7 +1077,7 @@
(-[WebView keyDown:]):
Added checks for command key.
-2002-08-01 Richard Williamson (Local) <rjw at apple.com>
+2002-08-01 Richard Williamson <rjw at apple.com>
Effort towards 3014555 (going back to frame), but not fixed.
Need to think more about appropriate solution and compromises.
@@ -1100,7 +1128,7 @@
* Plugins.subproj/WebPluginView.m:
(-[WebPluginView performKeyEquivalent:]):
-2002-08-01 Richard Williamson (Local) <rjw at apple.com>
+2002-08-01 Richard Williamson <rjw at apple.com>
More back/forward work. Support for restoring scroll position.
We still have a big remaining issue. We don't record the entire
@@ -1249,7 +1277,7 @@
it would be a mistake to get a redirect after having received
data.
-2002-07-30 Richard Williamson (local) <rjw at apple.com>
+2002-07-30 Richard Williamson <rjw at apple.com>
Remove annoying log, it's really annoying. Added FIX ME
comment instead.
@@ -1426,7 +1454,7 @@
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _mainHandle]): added, WebPluginStream needs this
-2002-07-25 Richard Williamson (Local) <rjw at apple.com>
+2002-07-25 Richard Williamson <rjw at apple.com>
More incremental changes for back/forward migration.
@@ -1631,7 +1659,7 @@
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView menuForEvent:]):
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Removed vestigal locationChangeHandler ivar.
@@ -1646,7 +1674,7 @@
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource receivedPageIcon:]):
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Implemented find for text views.
@@ -1730,7 +1758,7 @@
Renamed minimumFont to defaultFont, and changed it from 11 to 16.
Also changed default monospaced font to Courier instead of Monaco.
-2002-07-24 Richard Williamson (Local) <rjw at apple.com>
+2002-07-24 Richard Williamson <rjw at apple.com>
Support for find in HTML, find in text view coming soon.
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 838b436..a355117 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -30,10 +30,13 @@
NSString *applicationNameForUserAgent;
NSString *userAgentOverride;
NSLock *userAgentLock;
+
+ BOOL defersCallbacks;
}
@end
@interface WebController (WebPrivate);
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
@@ -43,4 +46,8 @@
- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path;
+
+- (BOOL)_defersCallbacks;
+- (void)_setDefersCallbacks:(BOOL)defers;
+
@end
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 490f4d2..ebe3194 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -192,4 +192,19 @@
[dataSource release];
}
+- (BOOL)_defersCallbacks
+{
+ return _private->defersCallbacks;
+}
+
+- (void)_setDefersCallbacks:(BOOL)defers
+{
+ if (defers == _private->defersCallbacks) {
+ return;
+ }
+
+ _private->defersCallbacks = defers;
+ [_private->mainFrame _defersCallbacksChanged];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 09e357d..4eef05d 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -170,8 +170,7 @@
// All data sources used in a document share the same controller.
// A single document may have many data sources corresponding to
// frames or iframes.
- if (_private->parent != nil)
- return [_private->parent controller];
+ WEBKIT_ASSERT(_private->parent == nil || [_private->parent controller] == _private->controller);
return _private->controller;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 2b0466c..f91177b 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -81,6 +81,7 @@
@end
@interface WebDataSource (WebPrivate)
+
- (void)_setResourceData:(NSData *)data;
- (Class)_representationClass;
- (void)_setRepresentation: (id<WebDocumentRepresentation>)representation;
@@ -121,4 +122,6 @@
- (void)_makeRepresentation;
- (void)_receivedData:(NSData *)data;
+- (void)_defersCallbacksChanged;
+
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index c0ea252..d2412d2 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -20,6 +20,7 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebTextRepresentation.h>
#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -132,11 +133,17 @@
- (void)_setController: (WebController *)controller
{
+ BOOL defers = [_private->controller _defersCallbacks];
+
if (_private->loading) {
[controller retain];
[_private->controller release];
}
_private->controller = controller;
+
+ if (defers != [_private->controller _defersCallbacks]) {
+ [self _defersCallbacksChanged];
+ }
}
- (void)_setParent: (WebDataSource *)p
@@ -187,9 +194,13 @@
- (void)_addResourceHandle: (WebResourceHandle *)handle
{
- if (_private->resourceHandles == nil)
+ if (_private->resourceHandles == nil) {
_private->resourceHandles = [[NSMutableArray alloc] init];
- [_private->resourceHandles addObject: handle];
+ }
+ if ([_private->controller _defersCallbacks]) {
+ [handle setDefersCallbacks:YES];
+ }
+ [_private->resourceHandles addObject:handle];
[self _setLoading:YES];
}
@@ -486,4 +497,18 @@
return _private->mainHandle;
}
+- (void)_defersCallbacksChanged
+{
+ BOOL defers = [_private->controller _defersCallbacks];
+
+ [_private->mainHandle setDefersCallbacks:defers];
+ NSEnumerator *e = [_private->resourceHandles objectEnumerator];
+ WebResourceHandle *handle;
+ while ((handle = [e nextObject])) {
+ [handle setDefersCallbacks:defers];
+ }
+
+ [[self children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 10a0d9b..7ae0189 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -73,6 +73,7 @@ typedef enum {
@end
@interface WebFrame (WebPrivate)
+
- (void)_parentDataSourceWillBeDeallocated;
- (void)_setController: (WebController *)controller;
- (void)_setDataSource: (WebDataSource *)d;
@@ -93,4 +94,7 @@ typedef enum {
- (void)_restoreScrollPosition;
- (void)_scrollToTop;
- (void)_textSizeMultiplierChanged;
+
+- (void)_defersCallbacksChanged;
+
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 148bfd3..e47c8f5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -694,4 +694,10 @@ static const char * const stateNames[] = {
[[[self dataSource] children] makeObjectsPerformSelector:@selector(_textSizeMultiplierChanged)];
}
+- (void)_defersCallbacksChanged
+{
+ [[self provisionalDataSource] _defersCallbacksChanged];
+ [[self dataSource] _defersCallbacksChanged];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 838b436..a355117 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -30,10 +30,13 @@
NSString *applicationNameForUserAgent;
NSString *userAgentOverride;
NSLock *userAgentLock;
+
+ BOOL defersCallbacks;
}
@end
@interface WebController (WebPrivate);
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
@@ -43,4 +46,8 @@
- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path;
+
+- (BOOL)_defersCallbacks;
+- (void)_setDefersCallbacks:(BOOL)defers;
+
@end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 490f4d2..ebe3194 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -192,4 +192,19 @@
[dataSource release];
}
+- (BOOL)_defersCallbacks
+{
+ return _private->defersCallbacks;
+}
+
+- (void)_setDefersCallbacks:(BOOL)defers
+{
+ if (defers == _private->defersCallbacks) {
+ return;
+ }
+
+ _private->defersCallbacks = defers;
+ [_private->mainFrame _defersCallbacksChanged];
+}
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list