[webkit-changes] cvs commit: WebKit/WebView.subproj
WebDefaultResourceLoadDelegate.m WebFrame.m WebLoader.m
WebResourceLoadDelegate.h WebUIDelegate.h WebView.h WebView.m
WebViewInternal.h WebViewPrivate.h
Timothy
thatcher at opensource.apple.com
Wed Oct 12 18:08:31 PDT 2005
thatcher 05/10/12 18:08:30
Modified: . ChangeLog
WebView.subproj WebDefaultResourceLoadDelegate.m WebFrame.m
WebLoader.m WebResourceLoadDelegate.h
WebUIDelegate.h WebView.h WebView.m
WebViewInternal.h WebViewPrivate.h
Log:
Reviewed by Darin.
Define WebNSInt and WebNSUInt to wrap around NSInt on Leopard and still build on Tiger
Once building on Tiger isn't needed we will drop WebNSInt and use NSInt
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:resource:didReceiveContentLength:fromDataSource:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame _sendRemainingDelegateMessagesWithIdentifier:response:length:error:]):
* WebView.subproj/WebLoader.m:
(-[NSURLProtocol didReceiveData:lengthReceived:]):
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebUIDelegate.h:
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
(-[WebView _mouseDidMoveOverElement:modifierFlags:]):
(-[WebView spellCheckerDocumentTag]):
* WebView.subproj/WebViewInternal.h:
* WebView.subproj/WebViewPrivate.h:
Revision Changes Path
1.3350 +22 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3349
retrieving revision 1.3350
diff -u -r1.3349 -r1.3350
--- ChangeLog 12 Oct 2005 21:02:41 -0000 1.3349
+++ ChangeLog 13 Oct 2005 01:08:12 -0000 1.3350
@@ -1,3 +1,25 @@
+2005-10-12 Timothy Hatcher <timothy at apple.com>
+
+ Reviewed by Darin.
+
+ Define WebNSInt and WebNSUInt to wrap around NSInt on Leopard and still build on Tiger
+ Once building on Tiger isn't needed we will drop WebNSInt and use NSInt
+
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveContentLength:fromDataSource:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _sendRemainingDelegateMessagesWithIdentifier:response:length:error:]):
+ * WebView.subproj/WebLoader.m:
+ (-[NSURLProtocol didReceiveData:lengthReceived:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebUIDelegate.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ (-[WebView _mouseDidMoveOverElement:modifierFlags:]):
+ (-[WebView spellCheckerDocumentTag]):
+ * WebView.subproj/WebViewInternal.h:
+ * WebView.subproj/WebViewPrivate.h:
+
2005-10-12 Darin Adler <darin at apple.com>
* WebView.subproj/WebPolicyDelegate.h: Fix a comment.
1.21 +7 -1 WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
Index: WebDefaultResourceLoadDelegate.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WebDefaultResourceLoadDelegate.m 5 Jun 2005 17:54:46 -0000 1.20
+++ WebDefaultResourceLoadDelegate.m 13 Oct 2005 01:08:23 -0000 1.21
@@ -26,6 +26,12 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+typedef unsigned int WebNSUInt;
+#else
+typedef NSUInt WebNSUInt;
+#endif
+
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <Foundation/NSURLAuthenticationChallenge.h>
@@ -77,7 +83,7 @@
{
}
--(void)webView: (WebView *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didReceiveContentLength: (WebNSUInt)length fromDataSource:(WebDataSource *)dataSource
{
}
1.253 +2 -2 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- WebFrame.m 8 Sep 2005 21:35:07 -0000 1.252
+++ WebFrame.m 13 Oct 2005 01:08:23 -0000 1.253
@@ -2685,9 +2685,9 @@
if (length > 0) {
if (implementations.delegateImplementsDidReceiveContentLength) {
- [delegate webView:wv resource:identifier didReceiveContentLength:length fromDataSource:dataSource];
+ [delegate webView:wv resource:identifier didReceiveContentLength:(WebNSUInt)length fromDataSource:dataSource];
} else {
- [sharedDelegate webView:wv resource:identifier didReceiveContentLength:length fromDataSource:dataSource];
+ [sharedDelegate webView:wv resource:identifier didReceiveContentLength:(WebNSUInt)length fromDataSource:dataSource];
}
}
1.98 +2 -2 WebKit/WebView.subproj/WebLoader.m
Index: WebLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebLoader.m,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- WebLoader.m 28 Sep 2005 21:04:59 -0000 1.97
+++ WebLoader.m 13 Oct 2005 01:08:24 -0000 1.98
@@ -535,9 +535,9 @@
[webView _incrementProgressForConnectionDelegate:self data:data];
if (implementations.delegateImplementsDidReceiveContentLength)
- [resourceLoadDelegate webView:webView resource:identifier didReceiveContentLength:lengthReceived fromDataSource:dataSource];
+ [resourceLoadDelegate webView:webView resource:identifier didReceiveContentLength:(WebNSUInt)lengthReceived fromDataSource:dataSource];
else
- [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:webView resource:identifier didReceiveContentLength:lengthReceived fromDataSource:dataSource];
+ [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:webView resource:identifier didReceiveContentLength:(WebNSUInt)lengthReceived fromDataSource:dataSource];
[self release];
}
1.34 +8 -2 WebKit/WebView.subproj/WebResourceLoadDelegate.h
Index: WebResourceLoadDelegate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebResourceLoadDelegate.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WebResourceLoadDelegate.h 5 Jun 2005 17:54:48 -0000 1.33
+++ WebResourceLoadDelegate.h 13 Oct 2005 01:08:24 -0000 1.34
@@ -26,6 +26,12 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#define WebNSInt int
+#else
+#define WebNSInt NSInt
+#endif
+
@class WebView;
@class WebDataSource;
@class NSURLAuthenticationChallenge;
@@ -118,7 +124,7 @@
@param length The amount of new data received. This is not the total amount, just the new amount received.
@param dataSource The dataSource that initiated the load.
*/
-- (void)webView:(WebView *)sender resource:(id)identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didReceiveContentLength:(WebNSInt)length fromDataSource:(WebDataSource *)dataSource;
/*!
@method webView:resource:didFinishLoadingFromDataSource:
@@ -157,4 +163,4 @@
@end
-
+#undef WebNSInt
\ No newline at end of file
1.36 +9 -1 WebKit/WebView.subproj/WebUIDelegate.h
Index: WebUIDelegate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebUIDelegate.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- WebUIDelegate.h 2 Aug 2005 17:14:41 -0000 1.35
+++ WebUIDelegate.h 13 Oct 2005 01:08:25 -0000 1.36
@@ -29,6 +29,12 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/NSURLRequest.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#define WebNSUInt unsigned int
+#else
+#define WebNSUInt NSUInt
+#endif
+
/*!
@enum WebMenuItemTag
@discussion Each menu item in the default menu items array passed in
@@ -385,7 +391,7 @@
@param elementInformation Dictionary that describes the element that the mouse is over, or nil.
@param modifierFlags The modifier flags as in NSEvent.
*/
-- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(WebNSUInt)modifierFlags;
/*!
@method webView:contextMenuItemsForElement:defaultMenuItems:
@@ -468,3 +474,5 @@
- (void)webView:(WebView *)webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:(NSPoint)point withPasteboard:(NSPasteboard *)pasteboard;
@end
+
+#undef WebNSUInt
\ No newline at end of file
1.162 +9 -1 WebKit/WebView.subproj/WebView.h
Index: WebView.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.h,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- WebView.h 23 Aug 2005 01:22:16 -0000 1.161
+++ WebView.h 13 Oct 2005 01:08:25 -0000 1.162
@@ -28,6 +28,12 @@
#import <Cocoa/Cocoa.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#define WebNSInt int
+#else
+#define WebNSInt NSInt
+#endif
+
@class DOMCSSStyleDeclaration;
@class DOMDocument;
@class DOMElement;
@@ -592,7 +598,7 @@
- (BOOL)smartInsertDeleteEnabled;
- (void)setContinuousSpellCheckingEnabled:(BOOL)flag;
- (BOOL)isContinuousSpellCheckingEnabled;
-- (int)spellCheckerDocumentTag;
+- (WebNSInt)spellCheckerDocumentTag;
- (NSUndoManager *)undoManager;
- (void)setEditingDelegate:(id)delegate;
- (id)editingDelegate;
@@ -706,3 +712,5 @@
*/
@end
+
+#undef WebNSInt
\ No newline at end of file
1.311 +2 -2 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- WebView.m 6 Oct 2005 15:46:12 -0000 1.310
+++ WebView.m 13 Oct 2005 01:08:25 -0000 1.311
@@ -657,7 +657,7 @@
return menu;
}
-- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(unsigned)modifierFlags
+- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(WebNSUInt)modifierFlags
{
// When the mouse isn't over this view at all, we'll get called with a dictionary of nil over
// and over again. So it's a good idea to catch that here and not send multiple calls to the delegate
@@ -2804,7 +2804,7 @@
return _private->continuousSpellCheckingEnabled && [self _continuousCheckingAllowed];
}
-- (int)spellCheckerDocumentTag
+- (WebNSInt)spellCheckerDocumentTag
{
if (!_private->hasSpellCheckerDocumentTag) {
_private->spellCheckerDocumentTag = [NSSpellChecker uniqueSpellDocumentTag];
1.23 +1 -1 WebKit/WebView.subproj/WebViewInternal.h
Index: WebViewInternal.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebViewInternal.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- WebViewInternal.h 20 Sep 2005 22:31:06 -0000 1.22
+++ WebViewInternal.h 13 Oct 2005 01:08:26 -0000 1.23
@@ -105,7 +105,7 @@
WebBridge *dragCaretBridge;
BOOL hasSpellCheckerDocumentTag;
- int spellCheckerDocumentTag;
+ WebNSInt spellCheckerDocumentTag;
BOOL continuousSpellCheckingEnabled;
BOOL smartInsertDeleteEnabled;
1.149 +12 -1 WebKit/WebView.subproj/WebViewPrivate.h
Index: WebViewPrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebViewPrivate.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- WebViewPrivate.h 23 Aug 2005 01:22:16 -0000 1.148
+++ WebViewPrivate.h 13 Oct 2005 01:08:26 -0000 1.149
@@ -26,6 +26,17 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+// Define WebNSInt and WebNSUInt to wrap around NSInt on Leopard and still build on Tiger
+// Once building on Tiger isn't needed we will drop WebNSInt and use NSInt
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+typedef int WebNSInt;
+typedef unsigned int WebNSUInt;
+#else
+typedef NSInt WebNSInt;
+typedef NSUInt WebNSUInt;
+#endif
+
#import <WebKit/WebView.h>
#import <WebKit/WebFramePrivate.h>
@@ -167,7 +178,7 @@
- (NSMenu *)_menuForElement:(NSDictionary *)element defaultItems:(NSArray *)items;
-- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(unsigned)modifierFlags;
+- (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(WebNSUInt)modifierFlags;
/*!
Could be worth adding to the API.
More information about the webkit-changes
mailing list