[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:36:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit da74a7d83756382b2cb4d91d2003b78211a1b550
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 22 20:06:38 2004 +0000
WebCore:
Reviewed by Hyatt
More work to bring code up to date with the latest API proposal.
* khtml/xml/dom_selection.h: Fix typo in comment.
* kwq/WebCoreBridge.h: -applyStyle:toElementsInDOMRange: is now applyStyle:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge applyStyle:]): Ditto.
WebKit:
Reviewed by Hyatt
More work to bring code up to date with the latest API proposal. Note that
all of the replaceXXX methods below now operate on the current selection, so
the method implementations have been simplifed accordingly.
* WebView.subproj/WebDataSource.m:
(-[WebDataSource _replaceSelectionWithArchive:]): New name for _replaceSelectionWithWebArchive.
* WebView.subproj/WebDataSourcePrivate.h: Ditto.
* WebView.subproj/WebDefaultEditingDelegate.m:
(-[WebDefaultEditingDelegate webViewShouldBeginEditing:inDOMRange:]): Added inDOMRange: parameter.
(-[WebDefaultEditingDelegate webViewShouldEndEditing:inDOMRange:]): Ditto.
(-[WebDefaultEditingDelegate webView shouldChangeSelectedDOMRange:toDOMRange:proposedRange affinity:stillSelecting:]):
Missed adding affinity in last patch.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _pasteFromPasteboard:]): Call old method with new name: _replaceSelectionWithArchive
* WebView.subproj/WebView.m:
(-[WebView replaceSelectionWithNode:]): New version of insertNode:replacingDOMRange:
(-[WebView replaceSelectionWithText:]): New version of insertText:replacingDOMRange:
(-[WebView replaceSelectionWithMarkupString:]): New version of insertMarkupString:replacingDOMRange:
(-[WebView replaceSelectionWithArchive:]): New version of insertWebArchive:replacingDOMRange:
(-[WebView deleteSelection]): New version of deleteDOMRange:
(-[WebView applyStyle:]): New version of applyStyle:toElementsInDOMRange:
* WebView.subproj/WebViewPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 33956b8..0692b94 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2004-04-22 Ken Kocienda <kocienda at apple.com>
+ Reviewed by Hyatt
+
+ More work to bring code up to date with the latest API proposal.
+
+ * khtml/xml/dom_selection.h: Fix typo in comment.
+ * kwq/WebCoreBridge.h: -applyStyle:toElementsInDOMRange: is now applyStyle:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge applyStyle:]): Ditto.
+
+2004-04-22 Ken Kocienda <kocienda at apple.com>
+
Reviewed by John
Adds the notion of selection affinity to the editing API, bringing it up to
diff --git a/WebCore/khtml/editing/SelectionController.h b/WebCore/khtml/editing/SelectionController.h
index 8d963c2..05434bc 100644
--- a/WebCore/khtml/editing/SelectionController.h
+++ b/WebCore/khtml/editing/SelectionController.h
@@ -53,7 +53,7 @@ public:
// These match the AppKit values for these concepts.
// From NSTextView.h:
// NSSelectionAffinityUpstream = 0
- // NSSelectionAffinityUpstream = 1
+ // NSSelectionAffinityDownstream = 1
enum EAffinity { UPSTREAM = 0, DOWNSTREAM = 1 };
Selection();
diff --git a/WebCore/khtml/editing/selection.h b/WebCore/khtml/editing/selection.h
index 8d963c2..05434bc 100644
--- a/WebCore/khtml/editing/selection.h
+++ b/WebCore/khtml/editing/selection.h
@@ -53,7 +53,7 @@ public:
// These match the AppKit values for these concepts.
// From NSTextView.h:
// NSSelectionAffinityUpstream = 0
- // NSSelectionAffinityUpstream = 1
+ // NSSelectionAffinityDownstream = 1
enum EAffinity { UPSTREAM = 0, DOWNSTREAM = 1 };
Selection();
diff --git a/WebCore/khtml/xml/dom_selection.h b/WebCore/khtml/xml/dom_selection.h
index 8d963c2..05434bc 100644
--- a/WebCore/khtml/xml/dom_selection.h
+++ b/WebCore/khtml/xml/dom_selection.h
@@ -53,7 +53,7 @@ public:
// These match the AppKit values for these concepts.
// From NSTextView.h:
// NSSelectionAffinityUpstream = 0
- // NSSelectionAffinityUpstream = 1
+ // NSSelectionAffinityDownstream = 1
enum EAffinity { UPSTREAM = 0, DOWNSTREAM = 1 };
Selection();
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 3f35d7c..90899fc 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -290,7 +290,7 @@ typedef enum {
- (void)replaceSelectionWithNewline;
- (void)deleteSelection;
- (void)deleteKeyPressed;
-- (void)applyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range;
+- (void)applyStyle:(DOMCSSStyleDeclaration *)style;
- (void)ensureCaretVisible;
- (void)bindObject:(id)object withName:(NSString *)name;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 5efb6e6..7c66a9b 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1433,7 +1433,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
TypingCommand::deleteKeyPressed(_part->xmlDocImpl());
}
-- (void)applyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range
+- (void)applyStyle:(DOMCSSStyleDeclaration *)style
{
ERROR("unimplemented");
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ead11fc..6b39978 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,32 @@
2004-04-22 Ken Kocienda <kocienda at apple.com>
+ Reviewed by Hyatt
+
+ More work to bring code up to date with the latest API proposal. Note that
+ all of the replaceXXX methods below now operate on the current selection, so
+ the method implementations have been simplifed accordingly.
+
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource _replaceSelectionWithArchive:]): New name for _replaceSelectionWithWebArchive.
+ * WebView.subproj/WebDataSourcePrivate.h: Ditto.
+ * WebView.subproj/WebDefaultEditingDelegate.m:
+ (-[WebDefaultEditingDelegate webViewShouldBeginEditing:inDOMRange:]): Added inDOMRange: parameter.
+ (-[WebDefaultEditingDelegate webViewShouldEndEditing:inDOMRange:]): Ditto.
+ (-[WebDefaultEditingDelegate webView shouldChangeSelectedDOMRange:toDOMRange:proposedRange affinity:stillSelecting:]):
+ Missed adding affinity in last patch.
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _pasteFromPasteboard:]): Call old method with new name: _replaceSelectionWithArchive
+ * WebView.subproj/WebView.m:
+ (-[WebView replaceSelectionWithNode:]): New version of insertNode:replacingDOMRange:
+ (-[WebView replaceSelectionWithText:]): New version of insertText:replacingDOMRange:
+ (-[WebView replaceSelectionWithMarkupString:]): New version of insertMarkupString:replacingDOMRange:
+ (-[WebView replaceSelectionWithArchive:]): New version of insertWebArchive:replacingDOMRange:
+ (-[WebView deleteSelection]): New version of deleteDOMRange:
+ (-[WebView applyStyle:]): New version of applyStyle:toElementsInDOMRange:
+ * WebView.subproj/WebViewPrivate.h:
+
+2004-04-22 Ken Kocienda <kocienda at apple.com>
+
Reviewed by John
Adds the notion of selection affinity to the editing API, bringing it up to
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 33754f8..eb5781a 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -223,7 +223,7 @@
[self _replaceSelectionWithMarkupString:[NSString stringWithFormat:@"<IMG SRC=\"%@\">", [[resource URL] _web_originalDataAsString]] baseURL:nil];
}
-- (BOOL)_replaceSelectionWithWebArchive:(WebArchive *)archive
+- (BOOL)_replaceSelectionWithArchive:(WebArchive *)archive
{
ASSERT(archive);
WebResource *mainResource = [archive mainResource];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 674060f..e963d6b 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -132,7 +132,7 @@
- (WebArchive *)_popSubframeArchiveWithName:(NSString *)frameName;
- (void)_replaceSelectionWithMarkupString:(NSString *)markupString baseURL:(NSURL *)baseURL;
-- (BOOL)_replaceSelectionWithWebArchive:(WebArchive *)archive;
+- (BOOL)_replaceSelectionWithArchive:(WebArchive *)archive;
- (void)_replaceSelectionWithImageResource:(WebResource *)resource;
- (NSError *)_mainDocumentError;
diff --git a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
index c01de0f..166610b 100644
--- a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
@@ -22,12 +22,12 @@ static WebDefaultEditingDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (BOOL)webViewShouldBeginEditing:(WebView *)webView
+- (BOOL)webViewShouldBeginEditing:(WebView *)webView inDOMRange:(DOMRange *)range
{
return YES;
}
-- (BOOL)webViewShouldEndEditing:(WebView *)webView
+- (BOOL)webViewShouldEndEditing:(WebView *)webView inDOMRange:(DOMRange *)range
{
return YES;
}
@@ -47,7 +47,7 @@ static WebDefaultEditingDelegate *sharedDelegate = nil;
return YES;
}
-- (BOOL)webView:(WebView *)webView shouldChangeSelectedDOMRange:(DOMRange *)currentRange toDOMRange:(DOMRange *)proposedRange stillSelecting:(BOOL)flag
+- (BOOL)webView:(WebView *)webView shouldChangeSelectedDOMRange:(DOMRange *)currentRange toDOMRange:(DOMRange *)proposedRange affinity:(NSSelectionAffinity)selectionAffinity stillSelecting:(BOOL)flag
{
return YES;
}
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 777efb1..4081ed0 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -591,7 +591,7 @@ static WebHTMLView *lastHitView = nil;
if ([types containsObject:WebArchivePboardType]) {
WebArchive *archive = [[WebArchive alloc] initWithData:[pasteboard dataForType:WebArchivePboardType]];
if (archive) {
- BOOL didPaste = [[self _dataSource] _replaceSelectionWithWebArchive:archive];
+ BOOL didPaste = [[self _dataSource] _replaceSelectionWithArchive:archive];
[archive release];
if (didPaste) {
return;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 1e36d84..a20b809 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2181,64 +2181,35 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
@implementation WebView (WebViewUndoableEditing)
-- (void)insertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range
+- (void)replaceSelectionWithNode:(DOMNode *)node
{
- if (!range)
- return;
-
- WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [bridge replaceSelectionWithNode:node];
+ [[self _bridgeForCurrentSelection] replaceSelectionWithNode:node];
}
-- (void)insertText:(NSString *)text replacingDOMRange:(DOMRange *)range
+- (void)replaceSelectionWithText:(NSString *)text
{
- if (!range)
- return;
-
- WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [bridge replaceSelectionWithText:text];
+ [[self _bridgeForCurrentSelection] replaceSelectionWithText:text];
}
-- (void)insertMarkupString:(NSString *)markupString replacingDOMRange:(DOMRange *)range
+- (void)replaceSelectionWithMarkupString:(NSString *)markupString
{
- if (!range)
- return;
-
- WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [bridge replaceSelectionWithMarkupString:markupString baseURLString:nil];
+ [[self _bridgeForCurrentSelection] replaceSelectionWithMarkupString:markupString baseURLString:nil];
}
-- (void)insertWebArchive:(WebArchive *)archive replacingDOMRange:(DOMRange *)range
+- (void)replaceSelectionWithArchive:(WebArchive *)archive
{
- if (!range)
- return;
-
WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [[[bridge webFrame] dataSource] _replaceSelectionWithWebArchive:archive];
+ [[[bridge webFrame] dataSource] _replaceSelectionWithArchive:archive];
}
-- (void)deleteDOMRange:(DOMRange *)range
+- (void)deleteSelection
{
- if (!range)
- return;
-
- WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [bridge deleteSelection];
+ [[self _bridgeForCurrentSelection] deleteSelection];
}
-- (void)applyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range
+- (void)applyStyle:(DOMCSSStyleDeclaration *)style
{
- if (!range)
- return;
-
- WebBridge *bridge = [self _bridgeForCurrentSelection];
- [bridge setSelectedDOMRange:range affinity:[bridge selectionAffinity]];
- [bridge applyStyle:style toElementsInDOMRange:range];
+ [[self _bridgeForCurrentSelection] applyStyle:style];
}
@end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index efa274f..127ec14 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -341,12 +341,12 @@ typedef enum {
@end
@interface WebView (WebViewUndoableEditing)
-- (void)insertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range;
-- (void)insertText:(NSString *)text replacingDOMRange:(DOMRange *)range;
-- (void)insertMarkupString:(NSString *)markupString replacingDOMRange:(DOMRange *)range;
-- (void)insertWebArchive:(WebArchive *)webArchive replacingDOMRange:(DOMRange *)range;
-- (void)deleteDOMRange:(DOMRange *)range;
-- (void)applyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range;
+- (void)replaceSelectionWithNode:(DOMNode *)node;
+- (void)replaceSelectionWithText:(NSString *)text;
+- (void)replaceSelectionWithMarkupString:(NSString *)markupString;
+- (void)replaceSelectionWithArchive:(WebArchive *)archive;
+- (void)deleteSelection;
+- (void)applyStyle:(DOMCSSStyleDeclaration *)style;
@end
extern NSString * const WebViewDidBeginEditingNotification;
@@ -356,8 +356,8 @@ extern NSString * const WebViewDidChangeTypingStyleNotification;
extern NSString * const WebViewDidChangeSelectionNotification;
@interface NSObject (WebViewEditingDelegate)
-- (BOOL)webViewShouldBeginEditing:(WebView *)webView;
-- (BOOL)webViewShouldEndEditing:(WebView *)webView;
+- (BOOL)webViewShouldBeginEditing:(WebView *)webView inDOMRange:(DOMRange *)range;
+- (BOOL)webViewShouldEndEditing:(WebView *)webView inDOMRange:(DOMRange *)range;
- (BOOL)webView:(WebView *)webView shouldInsertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
- (BOOL)webView:(WebView *)webView shouldInsertText:(NSString *)text replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
- (BOOL)webView:(WebView *)webView shouldDeleteDOMRange:(DOMRange *)range;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list