[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:45:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 74efe76bcaff576ee73f3fee3f97f9f598240e29
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 26 19:21:31 2003 +0000
WebCore:
More changes to make WebKit and WebCore compile with gcc 3.3.
Reviewed by darin.
* kwq/WebCoreBridge.h:
WebKit:
Changes to make WebKit compile with gcc 3.3.
Reviewed by darin.
* Carbon.subproj/HIWebView.m:
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge setScrollbarsVisible:]):
(-[WebBridge loadURL:referrer:reload:target:triggeringEvent:form:formValues:]):
(-[WebBridge postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
* WebView.subproj/WebPreferences.m:
(-[WebPreferences setDefaultFontSize:]):
(-[WebPreferences setDefaultFixedFontSize:]):
(-[WebPreferences setMinimumFontSize:]):
* WebView.subproj/WebView.m:
(-[WebView searchFor:direction:caseSensitive:wrap:]):
WebBrowser:
Changes to make WebBrowser compile with gcc 3.3.
Reviewed by darin.
* BrowserNSMenuExtras.h:
* BrowserNSMenuExtras.m:
(-[NSMenu addItemWithTitle:action:target:]):
(-[NSMenu itemWithTarget:andAction:]):
* BrowserNSNetServiceExtras.m:
* BrowserWindowController.m:
(-[BrowserWindowController tabBarView:menuForButtonForTabViewItem:event:]):
(-[BrowserWindowController goHome:]):
(-[BrowserWindowController makeTextLarger:]):
(-[BrowserWindowController makeTextSmaller:]):
(-[BrowserWindowController reportBugToApple:]):
* DateCell.m:
(-[DateCell drawWithFrame:inView:]):
* FormCompletionController.m:
(+[FormCompletionController clearAutoFillStateForFrame:]):
* Test/PageLoadTestController.m:
(-[PageLoadTestController showWindow:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 06745b4..170fa5c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
2003-06-26 Chris Blumenberg <cblu at apple.com>
+ More changes to make WebKit and WebCore compile with gcc 3.3.
+
+ Reviewed by darin.
+
+ * kwq/WebCoreBridge.h:
+
+2003-06-26 Chris Blumenberg <cblu at apple.com>
+
Made WebCore compile with gcc 3.3.
Reviewed by darin.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 06745b4..170fa5c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
2003-06-26 Chris Blumenberg <cblu at apple.com>
+ More changes to make WebKit and WebCore compile with gcc 3.3.
+
+ Reviewed by darin.
+
+ * kwq/WebCoreBridge.h:
+
+2003-06-26 Chris Blumenberg <cblu at apple.com>
+
Made WebCore compile with gcc 3.3.
Reviewed by darin.
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 8622f30..87465d4 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -234,8 +234,8 @@ enum FrameBorderStyle {
- (NSString *)generateFrameName;
- (void)frameDetached;
-- (void)loadURL:(NSString *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
-- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
+- (void)loadURL:(NSString *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values;
+- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values;
- (WebCoreBridge *)createWindowWithURL:(NSString *)URL frameName:(NSString *)name;
- (void)showWindow;
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index fb6d68b..12f9bf4 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -99,9 +99,12 @@ typedef struct HIWebView HIWebView;
@end
static const OSType NSAppKitPropertyCreator = 'akit';
+/*
+These constants are not used. Commented out to make the compiler happy.
static const OSType NSViewCarbonControlViewPropertyTag = 'view';
static const OSType NSViewCarbonControlAutodisplayPropertyTag = 'autd';
static const OSType NSViewCarbonControlFirstResponderViewPropertyTag = 'frvw';
+*/
static const OSType NSCarbonWindowPropertyTag = 'win ';
static SEL _NSSelectorForHICommand( const HICommand* hiCommand );
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cb7bee6..0fac5c8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2003-06-26 Chris Blumenberg <cblu at apple.com>
+
+ Changes to make WebKit compile with gcc 3.3.
+
+ Reviewed by darin.
+
+ * Carbon.subproj/HIWebView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge setScrollbarsVisible:]):
+ (-[WebBridge loadURL:referrer:reload:target:triggeringEvent:form:formValues:]):
+ (-[WebBridge postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ * WebView.subproj/WebPreferences.m:
+ (-[WebPreferences setDefaultFontSize:]):
+ (-[WebPreferences setDefaultFixedFontSize:]):
+ (-[WebPreferences setMinimumFontSize:]):
+ * WebView.subproj/WebView.m:
+ (-[WebView searchFor:direction:caseSensitive:wrap:]):
+
2003-06-24 Chris Blumenberg <cblu at apple.com>
Renamed the context menu item Download Image To Disk" to "Download Image to Disk".
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 52f971a..2c0e065 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -168,7 +168,7 @@
- (void)setScrollbarsVisible:(BOOL)visible
{
ASSERT(_frame != nil);
- return [[_frame frameView] setAllowsScrolling:visible];
+ [[_frame frameView] setAllowsScrolling:visible];
}
- (BOOL)isStatusBarVisible
@@ -427,7 +427,7 @@
[[self dataSource] _setIconURL:[NSURL _web_URLWithString:URL] withType:type];
}
-- (void)loadURL:(NSString *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
+- (void)loadURL:(NSString *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values
{
if ([target length] == 0) {
target = nil;
@@ -442,7 +442,7 @@
}
}
-- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
+- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values
{
if ([target length] == 0) {
target = nil;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 09531a0..748f747 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -140,9 +140,9 @@ extern NSString *WebCorePageCacheStateKey;
- (void)_invalidatePendingPolicyDecisionCallingDefaultAction:(BOOL)call;
- (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type;
-- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
+- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values;
- (void)_loadURL:(NSURL *)URL intoChild:(WebFrame *)childFrame;
-- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
+- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values;
- (void)_loadRequest:(NSURLRequest *)request inFrameNamed:(NSString *)frameName;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 284bb27..2934519 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -47,17 +47,6 @@ static const char * const stateNames[] = {
"WebFrameStateLayoutAcceptable",
"WebFrameStateComplete"
};
-
-static const char * const loadTypeNames[] = {
- "WebFrameLoadTypeStandard",
- "WebFrameLoadTypeBack",
- "WebFrameLoadTypeForward",
- "WebFrameLoadTypeIndexedBackForward",
- "WebFrameLoadTypeReload",
- "WebFrameLoadTypeReloadAllowingStaleData",
- "WebFrameLoadTypeSame",
- "WebFrameLoadTypeInternal"
-};
#endif
/*
@@ -1655,7 +1644,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// main funnel for navigating via callback from WebCore (e.g., clicking a link, redirect)
-- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
+- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values
{
BOOL isFormSubmission = (values != nil);
@@ -1791,7 +1780,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[childFrame _loadURL:URL referrer:[[self _bridge] referrer] loadType:childLoadType target:nil triggeringEvent:nil form:nil formValues:nil];
}
-- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
+- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values
{
// When posting, use the NSURLRequestReloadIgnoringCacheData load flag.
// This prevents a potential bug which may cause a page with a form that uses itself
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index e3a5814..dca78cb 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -342,7 +342,7 @@ NS_ENDHANDLER
- (void)setDefaultFontSize:(int)size
{
- return [self _setIntegerValue: size forKey: WebKitDefaultFontSizePreferenceKey];
+ [self _setIntegerValue: size forKey: WebKitDefaultFontSizePreferenceKey];
}
- (int)defaultFixedFontSize
@@ -352,7 +352,7 @@ NS_ENDHANDLER
- (void)setDefaultFixedFontSize:(int)size
{
- return [self _setIntegerValue: size forKey: WebKitDefaultFixedFontSizePreferenceKey];
+ [self _setIntegerValue: size forKey: WebKitDefaultFixedFontSizePreferenceKey];
}
- (int)minimumFontSize
@@ -362,7 +362,7 @@ NS_ENDHANDLER
- (void)setMinimumFontSize:(int)size
{
- return [self _setIntegerValue: size forKey: WebKitMinimumFontSizePreferenceKey];
+ [self _setIntegerValue: size forKey: WebKitMinimumFontSizePreferenceKey];
}
- (NSString *)defaultTextEncodingName
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 1a095d2..d7e8a86 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -601,13 +601,13 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
}
// Search the first frame, then all the other frames, in order
- id <WebDocumentSearching> startSearchView = nil;
+ NSView <WebDocumentSearching> *startSearchView = nil;
BOOL startHasSelection = NO;
WebFrame *frame = startFrame;
do {
id <WebDocumentView> view = [[frame frameView] documentView];
if ([view conformsToProtocol:@protocol(WebDocumentSearching)]) {
- id <WebDocumentSearching> searchView = (id <WebDocumentSearching>)view;
+ NSView <WebDocumentSearching> *searchView = (NSView <WebDocumentSearching> *)view;
// first time through
if (frame == startFrame) {
@@ -618,7 +618,7 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
} else if ([searchView conformsToProtocol:@protocol(WebDocumentText)]) {
startHasSelection = [(id <WebDocumentText>)searchView selectedString] != nil;
}
- startSearchView = (id <WebDocumentSearching>)searchView;
+ startSearchView = searchView;
}
// Note at this point we are assuming the search will be done top-to-bottom,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list