[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:24:40 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 33ac7a97ebb93e8be65d70eed15e14f4371794ba
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 16 00:33:42 2002 +0000
top level:
* Site/Internal/Design/IFRenamings.txt: Better naming proposals.
WebKit:
Fixes so we are ready to compile as Objective C, not C++.
The C++ front end misses a lot of things the C front end catches.
* Plugins.subproj/IFNullPluginView.mm:
(-[IFNullPluginView drawRect:]): Add missing cast.
* Plugins.subproj/IFPluginStream.mm:
(-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]): Use
[IFLoadProgress initWithURLHandle:] instead of getting at private fields.
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView setUpWindowAndPort]): Remove unused windowFrame.
(-[IFPluginView start]): Don't use a variable within a for statement.
Add missing cast.
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
Use [IFWebFrame _setProvisionalDataSource:] so we don't have to get at the
protected field _private.
* WebView.subproj/IFWebControllerPrivate.mm:
(-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
Use [IFProgress bytesSoFar] so we don't have to get at the protected field bytesSoFar.
* WebView.subproj/IFWebFramePrivate.mm:
(-[IFWebFrame _isLoadComplete]): Add missing cast.
(-[IFWebFrame _setProvisionalDataSource:]): Added.
* WebView.subproj/IFHTMLRepresentation.mm:
* WebView.subproj/IFHTMLViewPrivate.h:
* WebView.subproj/IFWebControllerPrivate.h:
* WebView.subproj/IFWebDataSourcePrivate.h:
* WebView.subproj/IFWebFramePrivate.h:
* WebView.subproj/IFWebViewPrivate.h:
Make data in private class @public, since the main class needs to get at it
directly.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d31cca1..d9093cf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,37 @@
+2002-07-15 Darin Adler <darin at apple.com>
+
+ Fixes so we are ready to compile as Objective C, not C++.
+ The C++ front end misses a lot of things the C front end catches.
+
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]): Add missing cast.
+ * Plugins.subproj/IFPluginStream.mm:
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]): Use
+ [IFLoadProgress initWithURLHandle:] instead of getting at private fields.
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView setUpWindowAndPort]): Remove unused windowFrame.
+ (-[IFPluginView start]): Don't use a variable within a for statement.
+ Add missing cast.
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ Use [IFWebFrame _setProvisionalDataSource:] so we don't have to get at the
+ protected field _private.
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+ Use [IFProgress bytesSoFar] so we don't have to get at the protected field bytesSoFar.
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _isLoadComplete]): Add missing cast.
+ (-[IFWebFrame _setProvisionalDataSource:]): Added.
+
+ * WebView.subproj/IFHTMLRepresentation.mm:
+ * WebView.subproj/IFHTMLViewPrivate.h:
+ * WebView.subproj/IFWebControllerPrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebViewPrivate.h:
+ Make data in private class @public, since the main class needs to get at it
+ directly.
+
2002-07-15 Richard Williamson (Home) <rjw at apple.com>
Only adjustFrames in parent if parent is a frame set.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d31cca1..d9093cf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,37 @@
+2002-07-15 Darin Adler <darin at apple.com>
+
+ Fixes so we are ready to compile as Objective C, not C++.
+ The C++ front end misses a lot of things the C front end catches.
+
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]): Add missing cast.
+ * Plugins.subproj/IFPluginStream.mm:
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]): Use
+ [IFLoadProgress initWithURLHandle:] instead of getting at private fields.
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView setUpWindowAndPort]): Remove unused windowFrame.
+ (-[IFPluginView start]): Don't use a variable within a for statement.
+ Add missing cast.
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ Use [IFWebFrame _setProvisionalDataSource:] so we don't have to get at the
+ protected field _private.
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+ Use [IFProgress bytesSoFar] so we don't have to get at the protected field bytesSoFar.
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _isLoadComplete]): Add missing cast.
+ (-[IFWebFrame _setProvisionalDataSource:]): Added.
+
+ * WebView.subproj/IFHTMLRepresentation.mm:
+ * WebView.subproj/IFHTMLViewPrivate.h:
+ * WebView.subproj/IFWebControllerPrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebViewPrivate.h:
+ Make data in private class @public, since the main class needs to get at it
+ directly.
+
2002-07-15 Richard Williamson (Home) <rjw at apple.com>
Only adjustFrames in parent if parent is a frame set.
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index df86c8f..7931805 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -54,7 +54,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_superviewWithName:@"IFWebView"];
+ webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/IFPluginStream.mm b/WebKit/Plugins.subproj/IFPluginStream.mm
index bc4a16e..e40a4a6 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.mm
+++ b/WebKit/Plugins.subproj/IFPluginStream.mm
@@ -223,17 +223,17 @@ static NSString *getCarbonPath(NSString *posixPath);
[self finishedLoadingWithData:[dataSource data]];
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
{
[[view webController] _didStartLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
+- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
IFWebController *webController = [view webController];
if(isFirstChunk){
- NSString *URLString = [[sender url] absoluteString];
+ NSString *URLString = [[handle url] absoluteString];
char *cURL = (char *)malloc([URLString cStringLength]+1);
[URLString getCString:cURL];
@@ -243,47 +243,45 @@ static NSString *getCarbonPath(NSString *posixPath);
npStream.lastmodified = 0;
npStream.notifyData = notifyData;
offset = 0;
- mimeType = [[sender contentType] retain];
+ mimeType = [[handle contentType] retain];
}
[self receivedData:data];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: NO];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
{
IFWebController *webController = [view webController];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self finishedLoadingWithData:data];
[webController _didStopLoading:URL];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
{
IFWebController *webController = [view webController];
[webController _receivedProgress:[IFLoadProgress progress]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self receivedError];
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
+- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
{
IFWebController *webController = [view webController];
- IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
- loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [sender contentLengthReceived];
+ IFLoadProgress *loadProgress = [[IFLoadProgress alloc] initWithURLHandle:handle];
- [webController _receivedError: result forResourceHandle: sender
+ [webController _receivedError: result forResourceHandle: handle
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
@@ -292,7 +290,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)toURL
+- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)toURL
{
IFWebController *webController = [view webController];
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index e708ebc..e2e8025 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -365,7 +365,6 @@ static char *newCString(NSString *string)
- (void)setUpWindowAndPort
{
CGrafPtr port = GetWindowPort([[self window] _windowRef]);
- NSRect windowFrame = [[self window] frame];
NSRect contentViewFrame = [[[self window] contentView] frame];
NSRect boundsInWindow = [self convertRect:[self bounds] toView:nil];
NSRect visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
@@ -460,7 +459,8 @@ static char *newCString(NSString *string)
theWindow = [self window];
notificationCenter = [NSNotificationCenter defaultCenter];
- for (NSView *view = self; view; view = [view superview]) {
+ NSView *view;
+ for (view = self; view; view = [view superview]) {
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
name:NSViewFrameDidChangeNotification object:view];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
@@ -478,7 +478,7 @@ static char *newCString(NSString *string)
if ([theWindow isKeyWindow])
[self sendActivateEvent:YES];
- IFWebView *webView = [self _IF_superviewWithName:@"IFWebView"];
+ IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
webController = [[webView controller] retain];
webFrame = [[webController frameForView:webView] retain];
webDataSource = [[webFrame dataSource] retain];
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index df86c8f..7931805 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -54,7 +54,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_superviewWithName:@"IFWebView"];
+ webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index bc4a16e..e40a4a6 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -223,17 +223,17 @@ static NSString *getCarbonPath(NSString *posixPath);
[self finishedLoadingWithData:[dataSource data]];
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
{
[[view webController] _didStartLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
+- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
IFWebController *webController = [view webController];
if(isFirstChunk){
- NSString *URLString = [[sender url] absoluteString];
+ NSString *URLString = [[handle url] absoluteString];
char *cURL = (char *)malloc([URLString cStringLength]+1);
[URLString getCString:cURL];
@@ -243,47 +243,45 @@ static NSString *getCarbonPath(NSString *posixPath);
npStream.lastmodified = 0;
npStream.notifyData = notifyData;
offset = 0;
- mimeType = [[sender contentType] retain];
+ mimeType = [[handle contentType] retain];
}
[self receivedData:data];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: NO];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
{
IFWebController *webController = [view webController];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self finishedLoadingWithData:data];
[webController _didStopLoading:URL];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
{
IFWebController *webController = [view webController];
[webController _receivedProgress:[IFLoadProgress progress]
- forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
+ forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self receivedError];
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
+- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
{
IFWebController *webController = [view webController];
- IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
- loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [sender contentLengthReceived];
+ IFLoadProgress *loadProgress = [[IFLoadProgress alloc] initWithURLHandle:handle];
- [webController _receivedError: result forResourceHandle: sender
+ [webController _receivedError: result forResourceHandle: handle
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
@@ -292,7 +290,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)toURL
+- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)toURL
{
IFWebController *webController = [view webController];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index e708ebc..e2e8025 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -365,7 +365,6 @@ static char *newCString(NSString *string)
- (void)setUpWindowAndPort
{
CGrafPtr port = GetWindowPort([[self window] _windowRef]);
- NSRect windowFrame = [[self window] frame];
NSRect contentViewFrame = [[[self window] contentView] frame];
NSRect boundsInWindow = [self convertRect:[self bounds] toView:nil];
NSRect visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
@@ -460,7 +459,8 @@ static char *newCString(NSString *string)
theWindow = [self window];
notificationCenter = [NSNotificationCenter defaultCenter];
- for (NSView *view = self; view; view = [view superview]) {
+ NSView *view;
+ for (view = self; view; view = [view superview]) {
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
name:NSViewFrameDidChangeNotification object:view];
[notificationCenter addObserver:self selector:@selector(viewHasMoved:)
@@ -478,7 +478,7 @@ static char *newCString(NSString *string)
if ([theWindow isKeyWindow])
[self sendActivateEvent:YES];
- IFWebView *webView = [self _IF_superviewWithName:@"IFWebView"];
+ IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
webController = [[webView controller] retain];
webFrame = [[webController frameForView:webView] retain];
webDataSource = [[webFrame dataSource] retain];
diff --git a/WebKit/WebView.subproj/IFHTMLRepresentation.mm b/WebKit/WebView.subproj/IFHTMLRepresentation.mm
index 055d85f..5479b3f 100644
--- a/WebKit/WebView.subproj/IFHTMLRepresentation.mm
+++ b/WebKit/WebView.subproj/IFHTMLRepresentation.mm
@@ -9,6 +9,7 @@
@interface IFHTMLRepresentationPrivate : NSObject
{
+ at public
IFWebCoreBridge *bridge;
}
@end
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.h b/WebKit/WebView.subproj/IFHTMLViewPrivate.h
index 9771538..1ec8d1b 100644
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/IFHTMLViewPrivate.h
@@ -12,6 +12,7 @@
@interface IFHTMLViewPrivate : NSObject
{
+ at public
IFWebController *controller;
BOOL needsLayout;
BOOL needsToApplyStyles;
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 76e075f..3037599 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -214,7 +214,7 @@
}
else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
if(!downloadHandler){
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
}
@@ -222,7 +222,7 @@
}
else if(contentPolicy == IFContentPolicyIgnore){
[handle cancelLoadInBackground];
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
}
else{
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.h b/WebKit/WebView.subproj/IFWebControllerPrivate.h
index e1cfd80..b229ce9 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.h
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.h
@@ -11,6 +11,7 @@
@interface IFWebControllerPrivate : NSObject
{
+ at public
IFWebFrame *mainFrame;
id<IFWindowContext> windowContext;
id<IFResourceProgressHandler> resourceProgressHandler;
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index be66e24..9ea390b 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -114,7 +114,7 @@
// Note that transitioning a frame to this state doesn't guarantee a layout, rather it
// just indicates that an early layout can be performed.
int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
- if (progress->bytesSoFar > timedLayoutSize)
+ if ([progress bytesSoFar] > timedLayoutSize)
[frame _transitionProvisionalToLayoutAcceptable];
}
}
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 65f2d8b..5449073 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -17,6 +17,7 @@
@interface IFWebDataSourcePrivate : NSObject
{
+ at public
NSData *resourceData;
id <IFDocumentRepresentation> representation;
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index b082067..32e9f57 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -35,6 +35,7 @@ typedef enum {
@interface IFWebFramePrivate : NSObject
{
+ at public
NSString *name;
IFWebView *webView;
IFWebDataSource *dataSource;
@@ -72,4 +73,5 @@ typedef enum {
- (void)_timedLayout: userInfo;
- (IFWebCoreFrame *)_frameBridge;
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
+- (void)_setProvisionalDataSource:(IFWebDataSource *)d;
@end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index e291e13..16c496d 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -352,7 +352,7 @@ static const char * const stateNames[6] = {
// Tell the just loaded document to layout. This may be necessary
// for non-html content that needs a layout message.
if ([thisView isDocumentHTML]){
- IFHTMLView *hview = thisDocumentView;
+ IFHTMLView *hview = (IFHTMLView *)thisDocumentView;
[hview setNeedsLayout: YES];
}
[thisDocumentView layout];
@@ -545,4 +545,9 @@ static const char * const stateNames[6] = {
}
}
+- (void)_setProvisionalDataSource:(IFWebDataSource *)d
+{
+ [_private setProvisionalDataSource:d];
+}
+
@end
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
index 1f83e68..2eebefd 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -8,12 +8,11 @@
#import <WebKit/IFWebView.h>
-class QWidget;
-
@class IFDynamicScrollBarsView;
@interface IFWebViewPrivate : NSObject
{
+ at public
IFWebController *controller;
IFDynamicScrollBarsView *frameScrollView;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index e1cfd80..b229ce9 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -11,6 +11,7 @@
@interface IFWebControllerPrivate : NSObject
{
+ at public
IFWebFrame *mainFrame;
id<IFWindowContext> windowContext;
id<IFResourceProgressHandler> resourceProgressHandler;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index be66e24..9ea390b 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -114,7 +114,7 @@
// Note that transitioning a frame to this state doesn't guarantee a layout, rather it
// just indicates that an early layout can be performed.
int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
- if (progress->bytesSoFar > timedLayoutSize)
+ if ([progress bytesSoFar] > timedLayoutSize)
[frame _transitionProvisionalToLayoutAcceptable];
}
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 65f2d8b..5449073 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -17,6 +17,7 @@
@interface IFWebDataSourcePrivate : NSObject
{
+ at public
NSData *resourceData;
id <IFDocumentRepresentation> representation;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index b082067..32e9f57 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -35,6 +35,7 @@ typedef enum {
@interface IFWebFramePrivate : NSObject
{
+ at public
NSString *name;
IFWebView *webView;
IFWebDataSource *dataSource;
@@ -72,4 +73,5 @@ typedef enum {
- (void)_timedLayout: userInfo;
- (IFWebCoreFrame *)_frameBridge;
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
+- (void)_setProvisionalDataSource:(IFWebDataSource *)d;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index e291e13..16c496d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -352,7 +352,7 @@ static const char * const stateNames[6] = {
// Tell the just loaded document to layout. This may be necessary
// for non-html content that needs a layout message.
if ([thisView isDocumentHTML]){
- IFHTMLView *hview = thisDocumentView;
+ IFHTMLView *hview = (IFHTMLView *)thisDocumentView;
[hview setNeedsLayout: YES];
}
[thisDocumentView layout];
@@ -545,4 +545,9 @@ static const char * const stateNames[6] = {
}
}
+- (void)_setProvisionalDataSource:(IFWebDataSource *)d
+{
+ [_private setProvisionalDataSource:d];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 1f83e68..2eebefd 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -8,12 +8,11 @@
#import <WebKit/IFWebView.h>
-class QWidget;
-
@class IFDynamicScrollBarsView;
@interface IFWebViewPrivate : NSObject
{
+ at public
IFWebController *controller;
IFDynamicScrollBarsView *frameScrollView;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 1f83e68..2eebefd 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -8,12 +8,11 @@
#import <WebKit/IFWebView.h>
-class QWidget;
-
@class IFDynamicScrollBarsView;
@interface IFWebViewPrivate : NSObject
{
+ at public
IFWebController *controller;
IFDynamicScrollBarsView *frameScrollView;
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 055d85f..5479b3f 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -9,6 +9,7 @@
@interface IFHTMLRepresentationPrivate : NSObject
{
+ at public
IFWebCoreBridge *bridge;
}
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 9771538..1ec8d1b 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -12,6 +12,7 @@
@interface IFHTMLViewPrivate : NSObject
{
+ at public
IFWebController *controller;
BOOL needsLayout;
BOOL needsToApplyStyles;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 76e075f..3037599 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -214,7 +214,7 @@
}
else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
if(!downloadHandler){
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
}
@@ -222,7 +222,7 @@
}
else if(contentPolicy == IFContentPolicyIgnore){
[handle cancelLoadInBackground];
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
}
else{
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 76e075f..3037599 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -214,7 +214,7 @@
}
else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
if(!downloadHandler){
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
}
@@ -222,7 +222,7 @@
}
else if(contentPolicy == IFContentPolicyIgnore){
[handle cancelLoadInBackground];
- [frame->_private setProvisionalDataSource:nil];
+ [frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
}
else{
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index e1cfd80..b229ce9 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -11,6 +11,7 @@
@interface IFWebControllerPrivate : NSObject
{
+ at public
IFWebFrame *mainFrame;
id<IFWindowContext> windowContext;
id<IFResourceProgressHandler> resourceProgressHandler;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index be66e24..9ea390b 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -114,7 +114,7 @@
// Note that transitioning a frame to this state doesn't guarantee a layout, rather it
// just indicates that an early layout can be performed.
int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
- if (progress->bytesSoFar > timedLayoutSize)
+ if ([progress bytesSoFar] > timedLayoutSize)
[frame _transitionProvisionalToLayoutAcceptable];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list