[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 08:39:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1d089388fac3a0a547a0a839913be39bacd45740
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 14 00:40:10 2004 +0000
Fixed some indenting issues in public headers.
* Plugins.subproj/WebJavaPlugIn.h:
* Plugins.subproj/WebPlugin.h:
* Plugins.subproj/WebScriptObject.h:
* WebView.subproj/WebEditingDelegate.h:
* WebView.subproj/WebFrameView.h:
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5de0a79..cffd039 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-13 Chris Blumenberg <cblu at apple.com>
+
+ Fixed some indenting issues in public headers.
+
+ * Plugins.subproj/WebJavaPlugIn.h:
+ * Plugins.subproj/WebPlugin.h:
+ * Plugins.subproj/WebScriptObject.h:
+ * WebView.subproj/WebEditingDelegate.h:
+ * WebView.subproj/WebFrameView.h:
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebView.h:
+
2004-05-13 Ken Kocienda <kocienda at apple.com>
Reviewed by Chris
diff --git a/WebKit/Plugins.subproj/WebJavaPlugIn.h b/WebKit/Plugins.subproj/WebJavaPlugIn.h
index 4e65531..4fde3d2 100644
--- a/WebKit/Plugins.subproj/WebJavaPlugIn.h
+++ b/WebKit/Plugins.subproj/WebJavaPlugIn.h
@@ -15,22 +15,22 @@
@interface NSObject (WebJavaPlugIn)
/*!
- @method webPlugInGetApplet
- @discusssion This returns the jobject representing the java applet to the
- WebPlugInContainer. It should always be called from the AppKit Main Thread.
- This method is only implemented by the Java plug-in.
+ @method webPlugInGetApplet
+ @discusssion This returns the jobject representing the java applet to the
+ WebPlugInContainer. It should always be called from the AppKit Main Thread.
+ This method is only implemented by the Java plug-in.
*/
- (jobject)webPlugInGetApplet;
/*!
- @method webPlugInCallJava:withMethod:withArgs:
- @param object The Java instance that will receive the method call.
- @param args The arguments to use with the method invocation.
- @discussion Calls in the Java from native code should not make direct
- use of JNI. Instead they should use this method to dispatch call to the
- Java VM. This is required to guarantee that the correct thread will receive
- the call. webPlugInCallJava:withMethod:withArgs: must always be called from
- the AppKit main thread. This method is only implemented by the Java plug-in.
+ @method webPlugInCallJava:withMethod:withArgs:
+ @param object The Java instance that will receive the method call.
+ @param args The arguments to use with the method invocation.
+ @discussion Calls in the Java from native code should not make direct
+ use of JNI. Instead they should use this method to dispatch call to the
+ Java VM. This is required to guarantee that the correct thread will receive
+ the call. webPlugInCallJava:withMethod:withArgs: must always be called from
+ the AppKit main thread. This method is only implemented by the Java plug-in.
@result The result of the method invocation.
*/
- (jvalue)webPlugInCallJava:(jobject)object withMethod:(jmethodID) withArgs:(jvalue*)args;
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index 95bda4d..86ea175 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -53,9 +53,9 @@
- (void)webPlugInDestroy;
/*!
- @method webPlugInSetIsSelected:
- @discusssion Informs the plug-in whether or not it is selected. This is typically
- used to allow the plug-in to alter it's appearance when selected.
+ @method webPlugInSetIsSelected:
+ @discusssion Informs the plug-in whether or not it is selected. This is typically
+ used to allow the plug-in to alter it's appearance when selected.
*/
- (void)webPlugInSetIsSelected:(BOOL)isSelected;
diff --git a/WebKit/Plugins.subproj/WebScriptObject.h b/WebKit/Plugins.subproj/WebScriptObject.h
index 1a1e61c..0ce41ee 100644
--- a/WebKit/Plugins.subproj/WebScriptObject.h
+++ b/WebKit/Plugins.subproj/WebScriptObject.h
@@ -60,8 +60,8 @@
@interface NSObject (WebScriptMethods)
/*!
- @method webScriptNameForSelector:
- @param aSelector The selector that will be exposed to the script environment.
+ @method webScriptNameForSelector:
+ @param aSelector The selector that will be exposed to the script environment.
@discussion Use the returned string as the exported name for the selector
in the script environment. It is the responsibility of the class to ensure
uniqueness of the returned name. If nil is returned or this
@@ -92,7 +92,7 @@
/*!
@method webScriptNameForKey:
- @param name The name of the instance variable that will be exposed to the
+ @param name The name of the instance variable that will be exposed to the
script enviroment. Only that properties that meet the export criteria will
be exposed.
@discussion Provide an alternate name for a property.
diff --git a/WebKit/WebView.subproj/WebEditingDelegate.h b/WebKit/WebView.subproj/WebEditingDelegate.h
index 4ebe36c..74f0599 100644
--- a/WebKit/WebView.subproj/WebEditingDelegate.h
+++ b/WebKit/WebView.subproj/WebEditingDelegate.h
@@ -12,9 +12,9 @@
@class WebView;
typedef enum {
- WebViewInsertActionTyped,
- WebViewInsertActionPasted,
- WebViewInsertActionDropped,
+ WebViewInsertActionTyped,
+ WebViewInsertActionPasted,
+ WebViewInsertActionDropped,
} WebViewInsertAction;
@interface NSObject (WebViewEditingDelegate)
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index cbed183..cbd1029 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -50,5 +50,4 @@
*/
- (BOOL)allowsScrolling;
-
@end
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index d8f7cd0..ec69102 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -16,14 +16,14 @@
/*!
- @enum WebNavigationType
- @abstract The type of action that triggered a possible navigation.
- @constant WebNavigationTypeLinkClicked A link with an href was clicked.
- @constant WebNavigationTypeFormSubmitted A form was submitted.
- @constant WebNavigationTypeBackForward The user chose back or forward.
- @constant WebNavigationTypeReload The User hit the reload button.
- @constant WebNavigationTypeFormResubmitted A form was resubmitted (by virtue of doing back, forward or reload).
- @constant WebNavigationTypeOther Navigation is taking place for some other reason.
+ @enum WebNavigationType
+ @abstract The type of action that triggered a possible navigation.
+ @constant WebNavigationTypeLinkClicked A link with an href was clicked.
+ @constant WebNavigationTypeFormSubmitted A form was submitted.
+ @constant WebNavigationTypeBackForward The user chose back or forward.
+ @constant WebNavigationTypeReload The User hit the reload button.
+ @constant WebNavigationTypeFormResubmitted A form was resubmitted (by virtue of doing back, forward or reload).
+ @constant WebNavigationTypeOther Navigation is taking place for some other reason.
*/
typedef enum {
@@ -133,20 +133,20 @@ extern NSString *WebActionOriginalURLKey; // NSURL
decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:
- @discussion This method is called to decide what to do with an targetted nagivation that would open a new window.
- @param actionInformation Dictionary that describes the action that triggered this navigation.
- @param request The request for the proposed navigation
- @param frame The frame in which the navigation is taking place
- @param listener The object to call when the decision is made
- @discussion This method is provided so that modified clicks on a targetted link which
- opens a new frame can prevent the new window from being opened if they decide to
- do something else, like download or present the new frame in a specialized way.
-
- <p>If this method picks a policy of Use, the new window will be
- opened, and decidePolicyForNavigationAction:request:frame:decisionListner:
- will be called with a WebNavigationType of WebNavigationTypeOther
- in its action. This is to avoid possible confusion about the modifiers.
+ @method webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:
+ @discussion This method is called to decide what to do with an targetted nagivation that would open a new window.
+ @param actionInformation Dictionary that describes the action that triggered this navigation.
+ @param request The request for the proposed navigation
+ @param frame The frame in which the navigation is taking place
+ @param listener The object to call when the decision is made
+ @discussion This method is provided so that modified clicks on a targetted link which
+ opens a new frame can prevent the new window from being opened if they decide to
+ do something else, like download or present the new frame in a specialized way.
+
+ <p>If this method picks a policy of Use, the new window will be
+ opened, and decidePolicyForNavigationAction:request:frame:decisionListner:
+ will be called with a WebNavigationType of WebNavigationTypeOther
+ in its action. This is to avoid possible confusion about the modifiers.
*/
- (void)webView:(WebView *)webView decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 86dc71a..1afb962 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -120,16 +120,16 @@
- (void)webView:(WebView *)sender resource:(id)identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
/*!
- @method webView:plugInFailedWithError:dataSource:
- @discussion Called when a plug-in is not found, fails to load or is not available for some reason.
- @param webView The WebView sending the message.
- @param error The plug-in error. In the userInfo dictionary of the error, the object for the
- NSErrorFailingURLKey key is a URL string of the SRC attribute, the object for the WebKitErrorPlugInNameKey
- key is a string of the plug-in's name, the object for the WebKitErrorPlugInPageURLStringKey key is a URL string
- of the PLUGINSPAGE attribute and the object for the WebKitErrorMIMETypeKey key is a string of the TYPE attribute.
- Some, none or all of the mentioned attributes can be present in the userInfo. The error returns nil for userInfo
- when none are present.
- @param dataSource The dataSource that contains the plug-in.
+ @method webView:plugInFailedWithError:dataSource:
+ @discussion Called when a plug-in is not found, fails to load or is not available for some reason.
+ @param webView The WebView sending the message.
+ @param error The plug-in error. In the userInfo dictionary of the error, the object for the
+ NSErrorFailingURLKey key is a URL string of the SRC attribute, the object for the WebKitErrorPlugInNameKey
+ key is a string of the plug-in's name, the object for the WebKitErrorPlugInPageURLStringKey key is a URL string
+ of the PLUGINSPAGE attribute and the object for the WebKitErrorMIMETypeKey key is a string of the TYPE attribute.
+ Some, none or all of the mentioned attributes can be present in the userInfo. The error returns nil for userInfo
+ when none are present.
+ @param dataSource The dataSource that contains the plug-in.
*/
- (void)webView:(WebView *)sender plugInFailedWithError:(NSError *)error dataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index bc4e385..0d3863e 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -23,9 +23,7 @@
@class WebScriptObject;
@class WebViewPrivate;
-// These strings are keys into the element dictionary provided in
-// the WebContextMenuDelegate's contextMenuItemsForElement and the WebwebViewPolicyDelegate's clickPolicyForElement.
-
+// Element dictionary keys
extern NSString *WebElementDOMNodeKey; // DOMNode of the element
extern NSString *WebElementFrameKey; // WebFrame of the element
extern NSString *WebElementImageAltStringKey; // NSString of the ALT attribute of the image element
@@ -39,14 +37,14 @@ extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
/*
- @discussion Notifications sent by WebView to mark the progress of loads.
- @constant WebViewProgressStartedNotification Posted whenever a load begins in the WebView, including
- a load that is initiated in a subframe. After receiving this notification zero or more
- WebViewProgressEstimateChangedNotifications will be sent. The userInfo will be nil.
- @constant WebViewProgressEstimateChangedNotification Posted whenever the value of
- estimatedProgress changes. The userInfo will be nil.
- @constant WebViewProgressFinishedNotification Posted when the load for a WebView has finished.
- The userInfo will be nil.
+ @discussion Notifications sent by WebView to mark the progress of loads.
+ @constant WebViewProgressStartedNotification Posted whenever a load begins in the WebView, including
+ a load that is initiated in a subframe. After receiving this notification zero or more
+ WebViewProgressEstimateChangedNotifications will be sent. The userInfo will be nil.
+ @constant WebViewProgressEstimateChangedNotification Posted whenever the value of
+ estimatedProgress changes. The userInfo will be nil.
+ @constant WebViewProgressFinishedNotification Posted when the load for a WebView has finished.
+ The userInfo will be nil.
*/
extern NSString *WebViewProgressStartedNotification;
extern NSString *WebViewProgressEstimateChangedNotification;
@@ -640,7 +638,7 @@ extern NSString * const WebViewDidChangeSelectionNotification;
- (void)changeColor:(id)sender;
- /* Alignment */
+ /* Alignment */
- (void)alignCenter:(id)sender;
- (void)alignJustified:(id)sender;
@@ -687,7 +685,7 @@ extern NSString * const WebViewDidChangeSelectionNotification;
- (void)performFindPanelAction:(id)sender;
- /* Speech */
+ /* Speech */
- (void)startSpeaking:(id)sender;
- (void)stopSpeaking:(id)sender;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list