[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:05:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit da0057ceb82c5a2ffa18d19b6f2f679a76633323
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 16 18:47:43 2002 +0000
A little simplifying of private pointers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1028 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c2b1d3b..7d5c813 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,24 @@
2002-04-16 Darin Adler <darin at apple.com>
+ A little simplifying of private pointers.
+
+ * MIME.subproj/IFDownloadHandler.m:
+ * MIME.subproj/IFDownloadHandlerPrivate.m:
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFPreferences.mm:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm:
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm:
+
+2002-04-16 Darin Adler <darin at apple.com>
+
Change headers so they don't include so much.
Also change IF_LOAD_TYPE to IFLoadType.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c2b1d3b..7d5c813 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,24 @@
2002-04-16 Darin Adler <darin at apple.com>
+ A little simplifying of private pointers.
+
+ * MIME.subproj/IFDownloadHandler.m:
+ * MIME.subproj/IFDownloadHandlerPrivate.m:
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFPreferences.mm:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm:
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm:
+
+2002-04-16 Darin Adler <darin at apple.com>
+
Change headers so they don't include so much.
Also change IF_LOAD_TYPE to IFLoadType.
diff --git a/WebKit/MIME.subproj/IFDownloadHandler.m b/WebKit/MIME.subproj/IFDownloadHandler.m
index f8573f5..d13747b 100644
--- a/WebKit/MIME.subproj/IFDownloadHandler.m
+++ b/WebKit/MIME.subproj/IFDownloadHandler.m
@@ -13,27 +13,27 @@
- (NSURL *) url
{
- return [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _url];
+ return [_downloadHandlerPrivate _url];
}
- (IFMIMEHandler *) mimeHandler
{
- return [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _mimeHandler];
+ return [_downloadHandlerPrivate _mimeHandler];
}
- (NSString *) suggestedFilename
{
- return [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _suggestedFilename];
+ return [_downloadHandlerPrivate _suggestedFilename];
}
- (void) cancelDownload
{
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _cancelDownload];
+ [_downloadHandlerPrivate _cancelDownload];
}
- (void) storeAtPath:(NSString *)path
{
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _storeAtPath:path];
+ [_downloadHandlerPrivate _storeAtPath:path];
}
- (void) dealloc
@@ -43,7 +43,7 @@
- (void) openAfterDownload:(BOOL)open
{
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _openAfterDownload:open];
+ [_downloadHandlerPrivate _openAfterDownload:open];
}
@end
diff --git a/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m b/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
index 6f65aac..a2d2e06 100644
--- a/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
+++ b/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
@@ -122,9 +122,9 @@
- _initWithURLHandle:(IFURLHandle *)uHandle mimeHandler:(IFMIMEHandler *)mHandler
{
- ((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) = [[IFDownloadHandlerPrivate alloc] init];
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _setURLHandle:uHandle];
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _setMIMEHandler:mHandler];
+ _downloadHandlerPrivate = [[IFDownloadHandlerPrivate alloc] init];
+ [_downloadHandlerPrivate _setURLHandle:uHandle];
+ [_downloadHandlerPrivate _setMIMEHandler:mHandler];
NSLog(@"Downloading: %@", [uHandle url]);
@@ -138,7 +138,7 @@
- (void) _finishedDownload
{
- [((IFDownloadHandlerPrivate *)_downloadHandlerPrivate) _finishedDownload];
+ [_downloadHandlerPrivate _finishedDownload];
}
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFBaseWebController.h b/WebKit/WebView.subproj/IFBaseWebController.h
index cb98bd8..525bc48 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.h
+++ b/WebKit/WebView.subproj/IFBaseWebController.h
@@ -15,7 +15,7 @@
@interface IFBaseWebController : NSObject <IFWebController>
{
@private
- IFBaseWebControllerPrivate *_controllerPrivate;
+ IFBaseWebControllerPrivate *_private;
}
// Calls designated initializer with nil arguments.
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index f78866a..182ee69 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -38,7 +38,6 @@
}
@end
-
@implementation IFBaseWebController
- init
@@ -46,23 +45,19 @@
return [self initWithView: nil provisionalDataSource: nil];
}
-
- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource
{
- IFBaseWebControllerPrivate *data;
[super init];
- data = [[IFBaseWebControllerPrivate alloc] init];
- _controllerPrivate = data;
- data->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" view: view provisionalDataSource: dataSource controller: self];
+ _private = [[IFBaseWebControllerPrivate alloc] init];
+ _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" view: view provisionalDataSource: dataSource controller: self];
return self;
}
-
- (void)dealloc
{
- [_controllerPrivate autorelease];
+ [_private release];
[super dealloc];
}
@@ -270,13 +265,9 @@
return [self _frameNamed: name fromFrame: [self mainFrame]];
}
-
-
- (IFWebFrame *)mainFrame
{
- IFBaseWebControllerPrivate *data = (IFBaseWebControllerPrivate *)_controllerPrivate;
-
- return data->mainFrame;
+ return _private->mainFrame;
}
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url
diff --git a/WebKit/WebView.subproj/IFPreferences.mm b/WebKit/WebView.subproj/IFPreferences.mm
index 7fd0249..20f17f8 100644
--- a/WebKit/WebView.subproj/IFPreferences.mm
+++ b/WebKit/WebView.subproj/IFPreferences.mm
@@ -51,14 +51,14 @@ static IFPreferences *_standardPreferences = nil;
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
- @"Georgia", WebKitStandardFontPreferenceKey,
+ @"Times New Roman", WebKitStandardFontPreferenceKey,
@"Monaco", WebKitFixedFontPreferenceKey,
@"Georgia", WebKitSerifFontPreferenceKey,
@"Arial", WebKitSansSerifFontPreferenceKey,
@"Apple Chancery", WebKitCursiveFontPreferenceKey,
@"Papyrus", WebKitFantasyFontPreferenceKey,
@"6", WebKitMinimumFontSizePreferenceKey,
- @"12", WebKitMediumFontSizePreferenceKey,
+ @"11", WebKitMediumFontSizePreferenceKey,
@"1.5", WebKitInitialTimedLayoutDelayPreferenceKey,
@"4096", WebKitInitialTimedLayoutSizePreferenceKey,
@"1.5", WebKitResourceTimedLayoutDelayPreferenceKey,
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 1a87b0b..4886b38 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -26,7 +26,7 @@
@interface IFWebDataSource : NSObject
{
@private
- IFWebDataSourcePrivate *_dataSourcePrivate;
+ IFWebDataSourcePrivate *_private;
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 36d5be6..395dc0e 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -52,7 +52,7 @@ static id IFWebDataSourceMake(void *url)
- (void)_commonInitialization
{
- _dataSourcePrivate = [[IFWebDataSourcePrivate alloc] init];
+ _private = [[IFWebDataSourcePrivate alloc] init];
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
@@ -60,7 +60,7 @@ static id IFWebDataSourceMake(void *url)
{
[super init];
[self _commonInitialization];
- _dataSourcePrivate->inputURL = [inputURL retain];
+ _private->inputURL = [inputURL retain];
return self;
}
@@ -76,7 +76,7 @@ static id IFWebDataSourceMake(void *url)
- (void)dealloc
{
- [_dataSourcePrivate release];
+ [_private release];
[super dealloc];
}
@@ -88,7 +88,7 @@ static id IFWebDataSourceMake(void *url)
- (IFWebFrame *)frame
{
- return [_dataSourcePrivate->controller frameForDataSource: self];
+ return [_private->controller frameForDataSource: self];
}
// Returns the name of the frame containing this data source, or nil
@@ -102,7 +102,7 @@ static id IFWebDataSourceMake(void *url)
// document, typically either a frameset or a normal HTML document.
- (BOOL)isMainDocument
{
- if (_dataSourcePrivate->parent == nil)
+ if (_private->parent == nil)
return YES;
return NO;
}
@@ -111,7 +111,7 @@ static id IFWebDataSourceMake(void *url)
// returns the parent data source.
- (IFWebDataSource *)parent
{
- return _dataSourcePrivate->parent;
+ return _private->parent;
}
@@ -119,25 +119,21 @@ static id IFWebDataSourceMake(void *url)
// associated with a frame set or iframe.
- (NSArray *)children
{
- return [_dataSourcePrivate->frames allValues];
+ return [_private->frames allValues];
}
- (void)addFrame: (IFWebFrame *)frame
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (data->frames == nil)
- data->frames = [[NSMutableDictionary alloc] init];
+ if (_private->frames == nil)
+ _private->frames = [[NSMutableDictionary alloc] init];
[[frame dataSource] _setParent: self];
- [data->frames setObject: frame forKey: [frame name]];
+ [_private->frames setObject: frame forKey: [frame name]];
}
- (IFWebFrame *)frameNamed: (NSString *)frameName
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- return (IFWebFrame *)[data->frames objectForKey: frameName];
+ return (IFWebFrame *)[_private->frames objectForKey: frameName];
}
@@ -147,7 +143,7 @@ static id IFWebDataSourceMake(void *url)
// frames then frameNames will return nil.
- (NSArray *)frameNames
{
- return [_dataSourcePrivate->frames allKeys];
+ return [_private->frames allKeys];
}
@@ -176,16 +172,16 @@ static id IFWebDataSourceMake(void *url)
// All data sources used in a document share the same
// controller. A single document may have many datasource corresponding to
// frame or iframes.
- if (_dataSourcePrivate->parent != nil)
- return [_dataSourcePrivate->parent controller];
- return _dataSourcePrivate->controller;
+ if (_private->parent != nil)
+ return [_private->parent controller];
+ return _private->controller;
}
// May return nil if not initialized with a URL.
- (NSURL *)inputURL
{
- return _dataSourcePrivate->inputURL;
+ return _private->inputURL;
}
@@ -195,7 +191,7 @@ static id IFWebDataSourceMake(void *url)
// a redirect is processed
- (NSURL *)redirectedURL
{
- return _dataSourcePrivate->finalURL;
+ return _private->finalURL;
}
@@ -203,7 +199,7 @@ static id IFWebDataSourceMake(void *url)
// i.e. inputURL != redirectedURL.
- (BOOL)wasRedirected
{
- return [_dataSourcePrivate->inputURL isEqual: [self redirectedURL]];
+ return [_private->inputURL isEqual: [self redirectedURL]];
}
@@ -229,14 +225,13 @@ static id IFWebDataSourceMake(void *url)
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)data->primaryLoadComplete, [data->urlHandles count], [[[self inputURL] absoluteString] cString]);
- if (data->primaryLoadComplete == NO)
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
+ if (_private->primaryLoadComplete == NO)
return YES;
- if ([data->urlHandles count])
+ if ([_private->urlHandles count])
return YES;
count = [[self children] count];
@@ -341,7 +336,7 @@ static id IFWebDataSourceMake(void *url)
// Returns nil or the page title.
- (NSString *)pageTitle
{
- return _dataSourcePrivate->pageTitle;
+ return _private->pageTitle;
}
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index da18650..a348618 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageDataSource.
*/
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 15d7a27..17f8ae4 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageDataSource.
*/
#import <WebKit/IFWebDataSourcePrivate.h>
@@ -66,42 +66,37 @@
@implementation IFWebDataSource (IFPrivate)
- (void)_setController: (id <IFWebController>)controller
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
+ WEBKIT_ASSERT (_private->part != nil);
- WEBKIT_ASSERT (data->part != nil);
-
- data->controller = controller;
- data->part->setDataSource (self);
+ _private->controller = controller;
+ _private->part->setDataSource (self);
}
- (KHTMLPart *)_part
{
- return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part;
+ return _private->part;
}
- (void)_setParent: (IFWebDataSource *)p
{
// Non-retained.
- ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = p;
+ _private->parent = p;
}
- (void)_setPrimaryLoadComplete: (BOOL)flag
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- data->primaryLoadComplete = flag;
+ _private->primaryLoadComplete = flag;
if (flag == YES){
- [data->mainURLHandleClient release];
- data->mainURLHandleClient = 0;
- [data->mainHandle autorelease];
- data->mainHandle = 0;
+ [_private->mainURLHandleClient release];
+ _private->mainURLHandleClient = 0;
+ [_private->mainHandle autorelease];
+ _private->mainHandle = 0;
}
}
- (void)_startLoading: (BOOL)forceRefresh
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
NSString *urlString = [[self inputURL] absoluteString];
NSURL *theURL;
KURL url = [[[self inputURL] absoluteString] cString];
@@ -123,16 +118,16 @@
}
theURL = [NSURL URLWithString:urlString];
- data->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
+ _private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
- data->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
- [data->mainHandle addClient: data->mainURLHandleClient];
+ _private->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
+ [_private->mainHandle addClient: _private->mainURLHandleClient];
// Mark the start loading time.
- data->loadingStartedTime = CFAbsoluteTimeGetCurrent();
+ _private->loadingStartedTime = CFAbsoluteTimeGetCurrent();
// Fire this guy up.
- [data->mainHandle loadInBackground];
+ [_private->mainHandle loadInBackground];
// FIXME [rjw]: Do any work need in the kde engine. This should be removed.
// We should move any code needed out of KWQ.
@@ -144,42 +139,36 @@
- (void)_addURLHandle: (IFURLHandle *)handle
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (data->urlHandles == nil)
- data->urlHandles = [[NSMutableArray alloc] init];
- [data->urlHandles addObject: handle];
+ if (_private->urlHandles == nil)
+ _private->urlHandles = [[NSMutableArray alloc] init];
+ [_private->urlHandles addObject: handle];
}
- (void)_removeURLHandle: (IFURLHandle *)handle
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- [data->urlHandles removeObject: handle];
+ [_private->urlHandles removeObject: handle];
}
- (BOOL)_isStopping
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return data->stopping;
+ return _private->stopping;
}
- (void)_stopLoading
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
IFURLHandle *handle;
- data->stopping = YES;
+ _private->stopping = YES;
- [data->mainHandle cancelLoadInBackground];
+ [_private->mainHandle cancelLoadInBackground];
// Tell all handles to stop loading.
- count = [data->urlHandles count];
+ count = [_private->urlHandles count];
for (i = 0; i < count; i++) {
- handle = [data->urlHandles objectAtIndex: i];
+ handle = [_private->urlHandles objectAtIndex: i];
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelling %s\n", [[[handle url] absoluteString] cString] );
- [[data->urlHandles objectAtIndex: i] cancelLoadInBackground];
+ [[_private->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
[self _part]->closeURL ();
@@ -208,58 +197,48 @@
- (double)_loadingStartedTime
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return data->loadingStartedTime;
+ return _private->loadingStartedTime;
}
- (void)_setTitle:(NSString *)title
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
NSMutableString *trimmed = [NSMutableString stringWithString:title];
CFStringTrimWhitespace((CFMutableStringRef) trimmed);
if ([trimmed length] == 0) {
trimmed = nil;
- if (data->pageTitle == nil)
+ if (_private->pageTitle == nil)
return;
} else {
- if ([data->pageTitle isEqualToString:trimmed])
+ if ([_private->pageTitle isEqualToString:trimmed])
return;
}
- [data->pageTitle autorelease];
- data->pageTitle = [[NSString stringWithString:trimmed] retain];
+ [_private->pageTitle autorelease];
+ _private->pageTitle = [[NSString stringWithString:trimmed] retain];
// The title doesn't get communicated to the controller until
// we reach the committed state for this data source's frame.
if ([[self frame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
- [[self _locationChangeHandler] receivedPageTitle:data->pageTitle forDataSource:self];
+ [[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
- (void)_setFinalURL: (NSURL *)url
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- [data->finalURL release];
- data->finalURL = [url retain];
+ [url retain];
+ [_private->finalURL release];
+ _private->finalURL = url;
}
- (id <IFLocationChangeHandler>)_locationChangeHandler
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- return data->locationChangeHandler;
+ return _private->locationChangeHandler;
}
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (l != data->locationChangeHandler){
- [data->locationChangeHandler release];
- data->locationChangeHandler = [l retain];
- }
+ [l retain];
+ [_private->locationChangeHandler release];
+ _private->locationChangeHandler = l;
}
-
@end
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 9ca9b33..e9cb4fe 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -17,7 +17,7 @@
@interface IFWebFrame : NSObject
{
@private
- IFWebFramePrivate *_framePrivate;
+ IFWebFramePrivate *_private;
}
- initWithName: (NSString *)name view: view provisionalDataSource: (IFWebDataSource *)dataSource controller: (id <IFWebController>)controller;
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 8f71a6f..929413a 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -51,11 +51,9 @@
- initWithName: (NSString *)n view: v provisionalDataSource: (IFWebDataSource *)d controller: (id<IFWebController>)c
{
- IFWebFramePrivate *data;
-
[super init];
- _framePrivate = [[IFWebFramePrivate alloc] init];
+ _private = [[IFWebFramePrivate alloc] init];
[self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
@@ -67,9 +65,7 @@
return nil;
}
- data = (IFWebFramePrivate *)_framePrivate;
-
- [data setName: n];
+ [_private setName: n];
if (v)
[self setView: v];
@@ -92,62 +88,53 @@
- (void)dealloc
{
- [_framePrivate release];
+ [_private release];
[super dealloc];
}
- (NSString *)name
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data name];
+ return [_private name];
}
-- (void)setView: v
+- (void)setView: (IFWebView *)v
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setView: v];
+ [_private setView: v];
[v _setController: [self controller]];
}
-- view
+- (IFWebView *)view
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data view];
+ return [_private view];
}
-
- (id <IFWebController>)controller
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data controller];
+ return [_private controller];
}
- (void)setController: (id <IFWebController>)controller
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setController: controller];
+ [_private setController: controller];
}
- (IFWebDataSource *)provisionalDataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data provisionalDataSource];
+ return [_private provisionalDataSource];
}
- (IFWebDataSource *)dataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data dataSource];
+ return [_private dataSource];
}
- (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
IFWebDataSource *oldDataSource;
id <IFLocationChangeHandler>locationChangeHandler;
@@ -181,7 +168,7 @@
[newDataSource _setController: [self controller]];
- [data setProvisionalDataSource: newDataSource];
+ [_private setProvisionalDataSource: newDataSource];
[[self view] provisionalDataSourceChanged: newDataSource];
@@ -201,56 +188,46 @@
- (void)startLoading
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
if (self == [[self controller] mainFrame])
WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
// Force refresh is irrelevant, as this will always be the first load.
// The controller will transition the provisional data source to the
// committed data source.
- [data->provisionalDataSource startLoading: NO];
+ [_private->provisionalDataSource startLoading: NO];
}
- (void)stopLoading
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
- [data->provisionalDataSource stopLoading];
- [data->dataSource stopLoading];
+ [_private->provisionalDataSource stopLoading];
+ [_private->dataSource stopLoading];
}
- (void)reload: (BOOL)forceRefresh
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
[self _clearErrors];
- [data->dataSource startLoading: forceRefresh];
+ [_private->dataSource startLoading: forceRefresh];
}
- (void)reset
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setDataSource: nil];
- [[data view] _resetWidget];
- [data setView: nil];
+ [_private setDataSource: nil];
+ [[_private view] _resetWidget];
+ [_private setView: nil];
}
- (NSDictionary *)errors
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return data->errors;
+ return _private->errors;
}
- (IFError *)mainDocumentError
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return data->mainDocumentError;
+ return _private->mainDocumentError;
}
-
@end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index f40007e..de9b41f 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -102,39 +102,39 @@ static const char * const stateNames[6] = {
- (void)_setController: (id <IFWebController>)controller
{
- [_framePrivate setController: controller];
+ [_private setController: controller];
}
- (void)_setRenderFramePart: (khtml::RenderPart *)p
{
- [_framePrivate setRenderFramePart:p];
+ [_private setRenderFramePart:p];
}
- (khtml::RenderPart *)_renderFramePart
{
- return [_framePrivate renderFramePart];
+ return [_private renderFramePart];
}
- (void)_setDataSource: (IFWebDataSource *)ds
{
- [_framePrivate setDataSource: ds];
+ [_private setDataSource: ds];
[ds _setController: [self controller]];
}
- (void)_scheduleLayout: (NSTimeInterval)inSeconds
{
- if (_framePrivate->scheduledLayoutPending == NO) {
+ if (_private->scheduledLayoutPending == NO) {
[NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
- _framePrivate->scheduledLayoutPending = YES;
+ _private->scheduledLayoutPending = YES;
}
}
- (void)_timedLayout: (id)userInfo
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_framePrivate->state]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_private->state]);
- _framePrivate->scheduledLayoutPending = NO;
- if (_framePrivate->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
+ _private->scheduledLayoutPending = NO;
+ if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
[[self view] setNeedsLayout: YES];
@@ -189,7 +189,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_UNINITIALIZED:
default:
{
- [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_framePrivate->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -214,7 +214,7 @@ static const char * const stateNames[6] = {
[view _removeSubviews];
// Set the committed data source on the frame.
- [self _setDataSource: _framePrivate->provisionalDataSource];
+ [self _setDataSource: _private->provisionalDataSource];
// If we're a frame (not the main frame) hookup the kde internals. This introduces a nasty dependency
// in kde on the view.
@@ -226,11 +226,11 @@ static const char * const stateNames[6] = {
// dataSourceChanged: will reset the view and begin trying to
// display the new new datasource.
- [view dataSourceChanged: _framePrivate->provisionalDataSource];
+ [view dataSourceChanged: _private->provisionalDataSource];
// Now that the provisional data source is committed, release it.
- [_framePrivate setProvisionalDataSource: nil];
+ [_private setProvisionalDataSource: nil];
[self _setState: IFWEBFRAMESTATE_COMMITTED_PAGE];
@@ -249,7 +249,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_COMPLETE:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_framePrivate->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -257,27 +257,27 @@ static const char * const stateNames[6] = {
- (IFWebFrameState)_state
{
- return _framePrivate->state;
+ return _private->state;
}
- (void)_setState: (IFWebFrameState)newState
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_framePrivate->state], stateNames[newState]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_private->state], stateNames[newState]);
if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_framePrivate->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame])
WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
- _framePrivate->state = newState;
+ _private->state = newState;
}
- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription
{
- if (_framePrivate->errors == 0)
- _framePrivate->errors = [[NSMutableDictionary alloc] init];
+ if (_private->errors == 0)
+ _private->errors = [[NSMutableDictionary alloc] init];
- [_framePrivate->errors setObject: error forKey: resourceDescription];
+ [_private->errors setObject: error forKey: resourceDescription];
}
- (void)_isLoadComplete
@@ -303,7 +303,7 @@ static const char * const stateNames[6] = {
if (![[self provisionalDataSource] isLoading]) {
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
// We now the provisional data source didn't cut the mustard, release it.
- [_framePrivate setProvisionalDataSource: nil];
+ [_private setProvisionalDataSource: nil];
[self _setState: IFWEBFRAMESTATE_COMPLETE];
[[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
@@ -419,16 +419,16 @@ static const char * const stateNames[6] = {
- (void)_setMainDocumentError: (IFError *)error
{
[error retain];
- [_framePrivate->mainDocumentError release];
- _framePrivate->mainDocumentError = error;
+ [_private->mainDocumentError release];
+ _private->mainDocumentError = error;
}
- (void)_clearErrors
{
- [_framePrivate->errors release];
- _framePrivate->errors = nil;
- [_framePrivate->mainDocumentError release];
- _framePrivate->mainDocumentError = nil;
+ [_private->errors release];
+ _private->errors = nil;
+ [_private->mainDocumentError release];
+ _private->mainDocumentError = nil;
}
@end
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index 69b78e6..245df76 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -80,7 +80,7 @@
@interface IFWebView : NSView
{
@private
- IFWebViewPrivate *_viewPrivate;
+ IFWebViewPrivate *_private;
}
- initWithFrame: (NSRect)frame;
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 4458055..f1be4c6 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -24,10 +24,10 @@
{
[super initWithFrame: frame];
- _viewPrivate = [[IFWebViewPrivate alloc] init];
+ _private = [[IFWebViewPrivate alloc] init];
- _viewPrivate->isFlipped = YES;
- _viewPrivate->needsLayout = YES;
+ _private->isFlipped = YES;
+ _private->needsLayout = YES;
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResized:) name: NSWindowDidResizeNotification object: nil];
@@ -39,7 +39,7 @@
{
[self _stopPlugins];
[[NSNotificationCenter defaultCenter] removeObserver: self];
- [_viewPrivate release];
+ [_private release];
[super dealloc];
}
@@ -47,7 +47,7 @@
// Note that the controller is not retained.
- (id <IFWebController>)controller
{
- return _viewPrivate->controller;
+ return _private->controller;
}
@@ -76,21 +76,21 @@
// the KHTMLPart.
KHTMLPart *part = [dataSource _part];
- _viewPrivate->provisionalWidget = new KHTMLView (part, 0);
- part->setView (_viewPrivate->provisionalWidget);
+ _private->provisionalWidget = new KHTMLView (part, 0);
+ part->setView (_private->provisionalWidget);
// Create a temporary provisional view. It will be replaced with
// the actual view once the datasource has been committed.
provisionalView = [[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
- _viewPrivate->provisionalWidget->setView (provisionalView);
+ _private->provisionalWidget->setView (provisionalView);
[provisionalView release];
- _viewPrivate->provisionalWidget->resize (r.size.width,r.size.height);
+ _private->provisionalWidget->resize (r.size.width,r.size.height);
}
- (void)dataSourceChanged: (IFWebDataSource *)dataSource
{
- IFWebViewPrivate *data = _viewPrivate;
+ IFWebViewPrivate *data = _private;
// Setup the real view.
if ([self _frameScrollView])
@@ -110,16 +110,16 @@
- (void)reapplyStyles
{
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (_viewPrivate->needsToApplyStyles){
+ if (_private->needsToApplyStyles){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
widget->part()->xmlDocImpl()->updateStyleSelector();
- _viewPrivate->needsToApplyStyles = NO;
+ _private->needsToApplyStyles = NO;
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s apply style seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
@@ -135,11 +135,11 @@
// understood how IFWebView will be subclassed.
- (void)layout
{
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (_viewPrivate->needsLayout){
+ if (_private->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
@@ -148,7 +148,7 @@
//double start = CFAbsoluteTimeGetCurrent();
widget->layout();
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
- _viewPrivate->needsLayout = NO;
+ _private->needsLayout = NO;
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
@@ -276,21 +276,21 @@
- (void)setNeedsLayout: (bool)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
- _viewPrivate->needsLayout = flag;
+ _private->needsLayout = flag;
}
- (void)setNeedsToApplyStyles: (bool)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
- _viewPrivate->needsToApplyStyles = flag;
+ _private->needsToApplyStyles = flag;
}
// This should eventually be removed.
- (void)drawRect:(NSRect)rect {
- KHTMLView *widget = _viewPrivate->widget;
- //IFWebViewPrivate *data = _viewPrivate;
+ KHTMLView *widget = _private->widget;
+ //IFWebViewPrivate *data = _private;
//if (data->provisionalWidget != 0){
// WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
@@ -321,10 +321,10 @@
[self lockFocus];
//double start = CFAbsoluteTimeGetCurrent();
- ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
- (int)rect.origin.y,
- (int)rect.size.width,
- (int)rect.size.height );
+ widget->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
#ifdef DEBUG_LAYOUT
@@ -355,13 +355,13 @@
- (void)setIsFlipped: (bool)flag
{
- _viewPrivate->isFlipped = flag;
+ _private->isFlipped = flag;
}
- (BOOL)isFlipped
{
- return _viewPrivate->isFlipped;
+ return _private->isFlipped;
}
@@ -396,7 +396,7 @@
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget != 0l) {
widget->viewportMouseReleaseEvent(kEvent);
}
@@ -425,7 +425,7 @@
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget != 0l) {
widget->viewportMousePressEvent(kEvent);
}
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
index b4cdb93..d02044b 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageView.
*/
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 41e4e03..3057105 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageView.
*/
#import <WebKit/WebKitDebug.h>
@@ -33,8 +33,8 @@
- (void)_resetWidget
{
- delete _viewPrivate->widget;
- _viewPrivate->widget = 0;
+ delete _private->widget;
+ _private->widget = 0;
}
- (void)_stopPlugins
@@ -57,18 +57,18 @@
- (void)_setController: (id <IFWebController>)controller
{
[controller retain];
- [_viewPrivate->controller release];
- _viewPrivate->controller = controller;
+ [_private->controller release];
+ _private->controller = controller;
}
- (KHTMLView *)_widget
{
- return _viewPrivate->widget;
+ return _private->widget;
}
- (DOM::DocumentImpl *)_document
{
- KHTMLPart *part = _viewPrivate->widget->part();
+ KHTMLPart *part = _private->widget->part();
if (part) {
return part->xmlDocImpl();
}
@@ -94,7 +94,7 @@
- (khtml::RenderObject *)_renderRoot
{
- KHTMLPart *part = _viewPrivate->widget->part();
+ KHTMLPart *part = _private->widget->part();
DOM::DocumentImpl *doc;
if (part) {
doc = part->xmlDocImpl();
@@ -106,14 +106,14 @@
- (KHTMLView *)_provisionalWidget
{
- return _viewPrivate->provisionalWidget;
+ return _private->provisionalWidget;
}
- (void)_setFrameScrollView: (NSScrollView *)sv
{
[sv retain];
- [_viewPrivate->frameScrollView release];
- _viewPrivate->frameScrollView = sv;
+ [_private->frameScrollView release];
+ _private->frameScrollView = sv;
//[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
//[sv setHasVerticalScroller: YES];
//[sv setHasHorizontalScroller: YES];
@@ -123,7 +123,7 @@
- (NSScrollView *)_frameScrollView
{
- return _viewPrivate->frameScrollView;
+ return _private->frameScrollView;
}
- (void)_setupScrollers
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 1a87b0b..4886b38 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -26,7 +26,7 @@
@interface IFWebDataSource : NSObject
{
@private
- IFWebDataSourcePrivate *_dataSourcePrivate;
+ IFWebDataSourcePrivate *_private;
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 36d5be6..395dc0e 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -52,7 +52,7 @@ static id IFWebDataSourceMake(void *url)
- (void)_commonInitialization
{
- _dataSourcePrivate = [[IFWebDataSourcePrivate alloc] init];
+ _private = [[IFWebDataSourcePrivate alloc] init];
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
@@ -60,7 +60,7 @@ static id IFWebDataSourceMake(void *url)
{
[super init];
[self _commonInitialization];
- _dataSourcePrivate->inputURL = [inputURL retain];
+ _private->inputURL = [inputURL retain];
return self;
}
@@ -76,7 +76,7 @@ static id IFWebDataSourceMake(void *url)
- (void)dealloc
{
- [_dataSourcePrivate release];
+ [_private release];
[super dealloc];
}
@@ -88,7 +88,7 @@ static id IFWebDataSourceMake(void *url)
- (IFWebFrame *)frame
{
- return [_dataSourcePrivate->controller frameForDataSource: self];
+ return [_private->controller frameForDataSource: self];
}
// Returns the name of the frame containing this data source, or nil
@@ -102,7 +102,7 @@ static id IFWebDataSourceMake(void *url)
// document, typically either a frameset or a normal HTML document.
- (BOOL)isMainDocument
{
- if (_dataSourcePrivate->parent == nil)
+ if (_private->parent == nil)
return YES;
return NO;
}
@@ -111,7 +111,7 @@ static id IFWebDataSourceMake(void *url)
// returns the parent data source.
- (IFWebDataSource *)parent
{
- return _dataSourcePrivate->parent;
+ return _private->parent;
}
@@ -119,25 +119,21 @@ static id IFWebDataSourceMake(void *url)
// associated with a frame set or iframe.
- (NSArray *)children
{
- return [_dataSourcePrivate->frames allValues];
+ return [_private->frames allValues];
}
- (void)addFrame: (IFWebFrame *)frame
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (data->frames == nil)
- data->frames = [[NSMutableDictionary alloc] init];
+ if (_private->frames == nil)
+ _private->frames = [[NSMutableDictionary alloc] init];
[[frame dataSource] _setParent: self];
- [data->frames setObject: frame forKey: [frame name]];
+ [_private->frames setObject: frame forKey: [frame name]];
}
- (IFWebFrame *)frameNamed: (NSString *)frameName
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- return (IFWebFrame *)[data->frames objectForKey: frameName];
+ return (IFWebFrame *)[_private->frames objectForKey: frameName];
}
@@ -147,7 +143,7 @@ static id IFWebDataSourceMake(void *url)
// frames then frameNames will return nil.
- (NSArray *)frameNames
{
- return [_dataSourcePrivate->frames allKeys];
+ return [_private->frames allKeys];
}
@@ -176,16 +172,16 @@ static id IFWebDataSourceMake(void *url)
// All data sources used in a document share the same
// controller. A single document may have many datasource corresponding to
// frame or iframes.
- if (_dataSourcePrivate->parent != nil)
- return [_dataSourcePrivate->parent controller];
- return _dataSourcePrivate->controller;
+ if (_private->parent != nil)
+ return [_private->parent controller];
+ return _private->controller;
}
// May return nil if not initialized with a URL.
- (NSURL *)inputURL
{
- return _dataSourcePrivate->inputURL;
+ return _private->inputURL;
}
@@ -195,7 +191,7 @@ static id IFWebDataSourceMake(void *url)
// a redirect is processed
- (NSURL *)redirectedURL
{
- return _dataSourcePrivate->finalURL;
+ return _private->finalURL;
}
@@ -203,7 +199,7 @@ static id IFWebDataSourceMake(void *url)
// i.e. inputURL != redirectedURL.
- (BOOL)wasRedirected
{
- return [_dataSourcePrivate->inputURL isEqual: [self redirectedURL]];
+ return [_private->inputURL isEqual: [self redirectedURL]];
}
@@ -229,14 +225,13 @@ static id IFWebDataSourceMake(void *url)
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)data->primaryLoadComplete, [data->urlHandles count], [[[self inputURL] absoluteString] cString]);
- if (data->primaryLoadComplete == NO)
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
+ if (_private->primaryLoadComplete == NO)
return YES;
- if ([data->urlHandles count])
+ if ([_private->urlHandles count])
return YES;
count = [[self children] count];
@@ -341,7 +336,7 @@ static id IFWebDataSourceMake(void *url)
// Returns nil or the page title.
- (NSString *)pageTitle
{
- return _dataSourcePrivate->pageTitle;
+ return _private->pageTitle;
}
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index da18650..a348618 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageDataSource.
*/
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 15d7a27..17f8ae4 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageDataSource.
*/
#import <WebKit/IFWebDataSourcePrivate.h>
@@ -66,42 +66,37 @@
@implementation IFWebDataSource (IFPrivate)
- (void)_setController: (id <IFWebController>)controller
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
+ WEBKIT_ASSERT (_private->part != nil);
- WEBKIT_ASSERT (data->part != nil);
-
- data->controller = controller;
- data->part->setDataSource (self);
+ _private->controller = controller;
+ _private->part->setDataSource (self);
}
- (KHTMLPart *)_part
{
- return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part;
+ return _private->part;
}
- (void)_setParent: (IFWebDataSource *)p
{
// Non-retained.
- ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = p;
+ _private->parent = p;
}
- (void)_setPrimaryLoadComplete: (BOOL)flag
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- data->primaryLoadComplete = flag;
+ _private->primaryLoadComplete = flag;
if (flag == YES){
- [data->mainURLHandleClient release];
- data->mainURLHandleClient = 0;
- [data->mainHandle autorelease];
- data->mainHandle = 0;
+ [_private->mainURLHandleClient release];
+ _private->mainURLHandleClient = 0;
+ [_private->mainHandle autorelease];
+ _private->mainHandle = 0;
}
}
- (void)_startLoading: (BOOL)forceRefresh
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
NSString *urlString = [[self inputURL] absoluteString];
NSURL *theURL;
KURL url = [[[self inputURL] absoluteString] cString];
@@ -123,16 +118,16 @@
}
theURL = [NSURL URLWithString:urlString];
- data->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
+ _private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
- data->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
- [data->mainHandle addClient: data->mainURLHandleClient];
+ _private->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
+ [_private->mainHandle addClient: _private->mainURLHandleClient];
// Mark the start loading time.
- data->loadingStartedTime = CFAbsoluteTimeGetCurrent();
+ _private->loadingStartedTime = CFAbsoluteTimeGetCurrent();
// Fire this guy up.
- [data->mainHandle loadInBackground];
+ [_private->mainHandle loadInBackground];
// FIXME [rjw]: Do any work need in the kde engine. This should be removed.
// We should move any code needed out of KWQ.
@@ -144,42 +139,36 @@
- (void)_addURLHandle: (IFURLHandle *)handle
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (data->urlHandles == nil)
- data->urlHandles = [[NSMutableArray alloc] init];
- [data->urlHandles addObject: handle];
+ if (_private->urlHandles == nil)
+ _private->urlHandles = [[NSMutableArray alloc] init];
+ [_private->urlHandles addObject: handle];
}
- (void)_removeURLHandle: (IFURLHandle *)handle
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- [data->urlHandles removeObject: handle];
+ [_private->urlHandles removeObject: handle];
}
- (BOOL)_isStopping
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return data->stopping;
+ return _private->stopping;
}
- (void)_stopLoading
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
IFURLHandle *handle;
- data->stopping = YES;
+ _private->stopping = YES;
- [data->mainHandle cancelLoadInBackground];
+ [_private->mainHandle cancelLoadInBackground];
// Tell all handles to stop loading.
- count = [data->urlHandles count];
+ count = [_private->urlHandles count];
for (i = 0; i < count; i++) {
- handle = [data->urlHandles objectAtIndex: i];
+ handle = [_private->urlHandles objectAtIndex: i];
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelling %s\n", [[[handle url] absoluteString] cString] );
- [[data->urlHandles objectAtIndex: i] cancelLoadInBackground];
+ [[_private->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
[self _part]->closeURL ();
@@ -208,58 +197,48 @@
- (double)_loadingStartedTime
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return data->loadingStartedTime;
+ return _private->loadingStartedTime;
}
- (void)_setTitle:(NSString *)title
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
NSMutableString *trimmed = [NSMutableString stringWithString:title];
CFStringTrimWhitespace((CFMutableStringRef) trimmed);
if ([trimmed length] == 0) {
trimmed = nil;
- if (data->pageTitle == nil)
+ if (_private->pageTitle == nil)
return;
} else {
- if ([data->pageTitle isEqualToString:trimmed])
+ if ([_private->pageTitle isEqualToString:trimmed])
return;
}
- [data->pageTitle autorelease];
- data->pageTitle = [[NSString stringWithString:trimmed] retain];
+ [_private->pageTitle autorelease];
+ _private->pageTitle = [[NSString stringWithString:trimmed] retain];
// The title doesn't get communicated to the controller until
// we reach the committed state for this data source's frame.
if ([[self frame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
- [[self _locationChangeHandler] receivedPageTitle:data->pageTitle forDataSource:self];
+ [[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
- (void)_setFinalURL: (NSURL *)url
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- [data->finalURL release];
- data->finalURL = [url retain];
+ [url retain];
+ [_private->finalURL release];
+ _private->finalURL = url;
}
- (id <IFLocationChangeHandler>)_locationChangeHandler
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- return data->locationChangeHandler;
+ return _private->locationChangeHandler;
}
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
{
- IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (l != data->locationChangeHandler){
- [data->locationChangeHandler release];
- data->locationChangeHandler = [l retain];
- }
+ [l retain];
+ [_private->locationChangeHandler release];
+ _private->locationChangeHandler = l;
}
-
@end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 9ca9b33..e9cb4fe 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -17,7 +17,7 @@
@interface IFWebFrame : NSObject
{
@private
- IFWebFramePrivate *_framePrivate;
+ IFWebFramePrivate *_private;
}
- initWithName: (NSString *)name view: view provisionalDataSource: (IFWebDataSource *)dataSource controller: (id <IFWebController>)controller;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 8f71a6f..929413a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -51,11 +51,9 @@
- initWithName: (NSString *)n view: v provisionalDataSource: (IFWebDataSource *)d controller: (id<IFWebController>)c
{
- IFWebFramePrivate *data;
-
[super init];
- _framePrivate = [[IFWebFramePrivate alloc] init];
+ _private = [[IFWebFramePrivate alloc] init];
[self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
@@ -67,9 +65,7 @@
return nil;
}
- data = (IFWebFramePrivate *)_framePrivate;
-
- [data setName: n];
+ [_private setName: n];
if (v)
[self setView: v];
@@ -92,62 +88,53 @@
- (void)dealloc
{
- [_framePrivate release];
+ [_private release];
[super dealloc];
}
- (NSString *)name
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data name];
+ return [_private name];
}
-- (void)setView: v
+- (void)setView: (IFWebView *)v
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setView: v];
+ [_private setView: v];
[v _setController: [self controller]];
}
-- view
+- (IFWebView *)view
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data view];
+ return [_private view];
}
-
- (id <IFWebController>)controller
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data controller];
+ return [_private controller];
}
- (void)setController: (id <IFWebController>)controller
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setController: controller];
+ [_private setController: controller];
}
- (IFWebDataSource *)provisionalDataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data provisionalDataSource];
+ return [_private provisionalDataSource];
}
- (IFWebDataSource *)dataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return [data dataSource];
+ return [_private dataSource];
}
- (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
IFWebDataSource *oldDataSource;
id <IFLocationChangeHandler>locationChangeHandler;
@@ -181,7 +168,7 @@
[newDataSource _setController: [self controller]];
- [data setProvisionalDataSource: newDataSource];
+ [_private setProvisionalDataSource: newDataSource];
[[self view] provisionalDataSourceChanged: newDataSource];
@@ -201,56 +188,46 @@
- (void)startLoading
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
if (self == [[self controller] mainFrame])
WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
// Force refresh is irrelevant, as this will always be the first load.
// The controller will transition the provisional data source to the
// committed data source.
- [data->provisionalDataSource startLoading: NO];
+ [_private->provisionalDataSource startLoading: NO];
}
- (void)stopLoading
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
- [data->provisionalDataSource stopLoading];
- [data->dataSource stopLoading];
+ [_private->provisionalDataSource stopLoading];
+ [_private->dataSource stopLoading];
}
- (void)reload: (BOOL)forceRefresh
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
[self _clearErrors];
- [data->dataSource startLoading: forceRefresh];
+ [_private->dataSource startLoading: forceRefresh];
}
- (void)reset
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- [data setDataSource: nil];
- [[data view] _resetWidget];
- [data setView: nil];
+ [_private setDataSource: nil];
+ [[_private view] _resetWidget];
+ [_private setView: nil];
}
- (NSDictionary *)errors
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return data->errors;
+ return _private->errors;
}
- (IFError *)mainDocumentError
{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- return data->mainDocumentError;
+ return _private->mainDocumentError;
}
-
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f40007e..de9b41f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -102,39 +102,39 @@ static const char * const stateNames[6] = {
- (void)_setController: (id <IFWebController>)controller
{
- [_framePrivate setController: controller];
+ [_private setController: controller];
}
- (void)_setRenderFramePart: (khtml::RenderPart *)p
{
- [_framePrivate setRenderFramePart:p];
+ [_private setRenderFramePart:p];
}
- (khtml::RenderPart *)_renderFramePart
{
- return [_framePrivate renderFramePart];
+ return [_private renderFramePart];
}
- (void)_setDataSource: (IFWebDataSource *)ds
{
- [_framePrivate setDataSource: ds];
+ [_private setDataSource: ds];
[ds _setController: [self controller]];
}
- (void)_scheduleLayout: (NSTimeInterval)inSeconds
{
- if (_framePrivate->scheduledLayoutPending == NO) {
+ if (_private->scheduledLayoutPending == NO) {
[NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
- _framePrivate->scheduledLayoutPending = YES;
+ _private->scheduledLayoutPending = YES;
}
}
- (void)_timedLayout: (id)userInfo
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_framePrivate->state]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_private->state]);
- _framePrivate->scheduledLayoutPending = NO;
- if (_framePrivate->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
+ _private->scheduledLayoutPending = NO;
+ if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
[[self view] setNeedsLayout: YES];
@@ -189,7 +189,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_UNINITIALIZED:
default:
{
- [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_framePrivate->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -214,7 +214,7 @@ static const char * const stateNames[6] = {
[view _removeSubviews];
// Set the committed data source on the frame.
- [self _setDataSource: _framePrivate->provisionalDataSource];
+ [self _setDataSource: _private->provisionalDataSource];
// If we're a frame (not the main frame) hookup the kde internals. This introduces a nasty dependency
// in kde on the view.
@@ -226,11 +226,11 @@ static const char * const stateNames[6] = {
// dataSourceChanged: will reset the view and begin trying to
// display the new new datasource.
- [view dataSourceChanged: _framePrivate->provisionalDataSource];
+ [view dataSourceChanged: _private->provisionalDataSource];
// Now that the provisional data source is committed, release it.
- [_framePrivate setProvisionalDataSource: nil];
+ [_private setProvisionalDataSource: nil];
[self _setState: IFWEBFRAMESTATE_COMMITTED_PAGE];
@@ -249,7 +249,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_COMPLETE:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_framePrivate->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -257,27 +257,27 @@ static const char * const stateNames[6] = {
- (IFWebFrameState)_state
{
- return _framePrivate->state;
+ return _private->state;
}
- (void)_setState: (IFWebFrameState)newState
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_framePrivate->state], stateNames[newState]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_private->state], stateNames[newState]);
if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_framePrivate->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame])
WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
- _framePrivate->state = newState;
+ _private->state = newState;
}
- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription
{
- if (_framePrivate->errors == 0)
- _framePrivate->errors = [[NSMutableDictionary alloc] init];
+ if (_private->errors == 0)
+ _private->errors = [[NSMutableDictionary alloc] init];
- [_framePrivate->errors setObject: error forKey: resourceDescription];
+ [_private->errors setObject: error forKey: resourceDescription];
}
- (void)_isLoadComplete
@@ -303,7 +303,7 @@ static const char * const stateNames[6] = {
if (![[self provisionalDataSource] isLoading]) {
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
// We now the provisional data source didn't cut the mustard, release it.
- [_framePrivate setProvisionalDataSource: nil];
+ [_private setProvisionalDataSource: nil];
[self _setState: IFWEBFRAMESTATE_COMPLETE];
[[[self provisionalDataSource] _locationChangeHandler] locationChangeDone: [self mainDocumentError]];
@@ -419,16 +419,16 @@ static const char * const stateNames[6] = {
- (void)_setMainDocumentError: (IFError *)error
{
[error retain];
- [_framePrivate->mainDocumentError release];
- _framePrivate->mainDocumentError = error;
+ [_private->mainDocumentError release];
+ _private->mainDocumentError = error;
}
- (void)_clearErrors
{
- [_framePrivate->errors release];
- _framePrivate->errors = nil;
- [_framePrivate->mainDocumentError release];
- _framePrivate->mainDocumentError = nil;
+ [_private->errors release];
+ _private->errors = nil;
+ [_private->mainDocumentError release];
+ _private->mainDocumentError = nil;
}
@end
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 69b78e6..245df76 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -80,7 +80,7 @@
@interface IFWebView : NSView
{
@private
- IFWebViewPrivate *_viewPrivate;
+ IFWebViewPrivate *_private;
}
- initWithFrame: (NSRect)frame;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 4458055..f1be4c6 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -24,10 +24,10 @@
{
[super initWithFrame: frame];
- _viewPrivate = [[IFWebViewPrivate alloc] init];
+ _private = [[IFWebViewPrivate alloc] init];
- _viewPrivate->isFlipped = YES;
- _viewPrivate->needsLayout = YES;
+ _private->isFlipped = YES;
+ _private->needsLayout = YES;
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResized:) name: NSWindowDidResizeNotification object: nil];
@@ -39,7 +39,7 @@
{
[self _stopPlugins];
[[NSNotificationCenter defaultCenter] removeObserver: self];
- [_viewPrivate release];
+ [_private release];
[super dealloc];
}
@@ -47,7 +47,7 @@
// Note that the controller is not retained.
- (id <IFWebController>)controller
{
- return _viewPrivate->controller;
+ return _private->controller;
}
@@ -76,21 +76,21 @@
// the KHTMLPart.
KHTMLPart *part = [dataSource _part];
- _viewPrivate->provisionalWidget = new KHTMLView (part, 0);
- part->setView (_viewPrivate->provisionalWidget);
+ _private->provisionalWidget = new KHTMLView (part, 0);
+ part->setView (_private->provisionalWidget);
// Create a temporary provisional view. It will be replaced with
// the actual view once the datasource has been committed.
provisionalView = [[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
- _viewPrivate->provisionalWidget->setView (provisionalView);
+ _private->provisionalWidget->setView (provisionalView);
[provisionalView release];
- _viewPrivate->provisionalWidget->resize (r.size.width,r.size.height);
+ _private->provisionalWidget->resize (r.size.width,r.size.height);
}
- (void)dataSourceChanged: (IFWebDataSource *)dataSource
{
- IFWebViewPrivate *data = _viewPrivate;
+ IFWebViewPrivate *data = _private;
// Setup the real view.
if ([self _frameScrollView])
@@ -110,16 +110,16 @@
- (void)reapplyStyles
{
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (_viewPrivate->needsToApplyStyles){
+ if (_private->needsToApplyStyles){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
widget->part()->xmlDocImpl()->updateStyleSelector();
- _viewPrivate->needsToApplyStyles = NO;
+ _private->needsToApplyStyles = NO;
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s apply style seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
@@ -135,11 +135,11 @@
// understood how IFWebView will be subclassed.
- (void)layout
{
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (_viewPrivate->needsLayout){
+ if (_private->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
@@ -148,7 +148,7 @@
//double start = CFAbsoluteTimeGetCurrent();
widget->layout();
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
- _viewPrivate->needsLayout = NO;
+ _private->needsLayout = NO;
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
@@ -276,21 +276,21 @@
- (void)setNeedsLayout: (bool)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
- _viewPrivate->needsLayout = flag;
+ _private->needsLayout = flag;
}
- (void)setNeedsToApplyStyles: (bool)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
- _viewPrivate->needsToApplyStyles = flag;
+ _private->needsToApplyStyles = flag;
}
// This should eventually be removed.
- (void)drawRect:(NSRect)rect {
- KHTMLView *widget = _viewPrivate->widget;
- //IFWebViewPrivate *data = _viewPrivate;
+ KHTMLView *widget = _private->widget;
+ //IFWebViewPrivate *data = _private;
//if (data->provisionalWidget != 0){
// WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
@@ -321,10 +321,10 @@
[self lockFocus];
//double start = CFAbsoluteTimeGetCurrent();
- ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
- (int)rect.origin.y,
- (int)rect.size.width,
- (int)rect.size.height );
+ widget->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
#ifdef DEBUG_LAYOUT
@@ -355,13 +355,13 @@
- (void)setIsFlipped: (bool)flag
{
- _viewPrivate->isFlipped = flag;
+ _private->isFlipped = flag;
}
- (BOOL)isFlipped
{
- return _viewPrivate->isFlipped;
+ return _private->isFlipped;
}
@@ -396,7 +396,7 @@
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget != 0l) {
widget->viewportMouseReleaseEvent(kEvent);
}
@@ -425,7 +425,7 @@
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- KHTMLView *widget = _viewPrivate->widget;
+ KHTMLView *widget = _private->widget;
if (widget != 0l) {
widget->viewportMousePressEvent(kEvent);
}
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index b4cdb93..d02044b 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageView.
*/
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index b4cdb93..d02044b 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageView.
*/
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 41e4e03..3057105 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -2,7 +2,7 @@
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
+ in WebCore. Instances of this class are referenced by _private in
NSWebPageView.
*/
#import <WebKit/WebKitDebug.h>
@@ -33,8 +33,8 @@
- (void)_resetWidget
{
- delete _viewPrivate->widget;
- _viewPrivate->widget = 0;
+ delete _private->widget;
+ _private->widget = 0;
}
- (void)_stopPlugins
@@ -57,18 +57,18 @@
- (void)_setController: (id <IFWebController>)controller
{
[controller retain];
- [_viewPrivate->controller release];
- _viewPrivate->controller = controller;
+ [_private->controller release];
+ _private->controller = controller;
}
- (KHTMLView *)_widget
{
- return _viewPrivate->widget;
+ return _private->widget;
}
- (DOM::DocumentImpl *)_document
{
- KHTMLPart *part = _viewPrivate->widget->part();
+ KHTMLPart *part = _private->widget->part();
if (part) {
return part->xmlDocImpl();
}
@@ -94,7 +94,7 @@
- (khtml::RenderObject *)_renderRoot
{
- KHTMLPart *part = _viewPrivate->widget->part();
+ KHTMLPart *part = _private->widget->part();
DOM::DocumentImpl *doc;
if (part) {
doc = part->xmlDocImpl();
@@ -106,14 +106,14 @@
- (KHTMLView *)_provisionalWidget
{
- return _viewPrivate->provisionalWidget;
+ return _private->provisionalWidget;
}
- (void)_setFrameScrollView: (NSScrollView *)sv
{
[sv retain];
- [_viewPrivate->frameScrollView release];
- _viewPrivate->frameScrollView = sv;
+ [_private->frameScrollView release];
+ _private->frameScrollView = sv;
//[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
//[sv setHasVerticalScroller: YES];
//[sv setHasHorizontalScroller: YES];
@@ -123,7 +123,7 @@
- (NSScrollView *)_frameScrollView
{
- return _viewPrivate->frameScrollView;
+ return _private->frameScrollView;
}
- (void)_setupScrollers
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 7fd0249..20f17f8 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -51,14 +51,14 @@ static IFPreferences *_standardPreferences = nil;
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
- @"Georgia", WebKitStandardFontPreferenceKey,
+ @"Times New Roman", WebKitStandardFontPreferenceKey,
@"Monaco", WebKitFixedFontPreferenceKey,
@"Georgia", WebKitSerifFontPreferenceKey,
@"Arial", WebKitSansSerifFontPreferenceKey,
@"Apple Chancery", WebKitCursiveFontPreferenceKey,
@"Papyrus", WebKitFantasyFontPreferenceKey,
@"6", WebKitMinimumFontSizePreferenceKey,
- @"12", WebKitMediumFontSizePreferenceKey,
+ @"11", WebKitMediumFontSizePreferenceKey,
@"1.5", WebKitInitialTimedLayoutDelayPreferenceKey,
@"4096", WebKitInitialTimedLayoutSizePreferenceKey,
@"1.5", WebKitResourceTimedLayoutDelayPreferenceKey,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list