[webkit-changes] cvs commit: WebCore/kwq KWQKHTMLPart.h
KWQKHTMLPart.mm WebCoreBridge.h WebCoreBridge.mm
John
sullivan at opensource.apple.com
Mon Dec 5 14:01:34 PST 2005
sullivan 05/12/05 14:01:34
Modified: . ChangeLog
kwq KWQKHTMLPart.h KWQKHTMLPart.mm WebCoreBridge.h
WebCoreBridge.mm
Log:
Reviewed by Tim Omernick.
- WebCore part of fix for
<rdar://problem/4365690> Find > Jump to Selection does nothing on plain-text documents (inc. source HTML)
No behavioral changes here. This patch just eliminates the name "jumpToSelection" in favor of
"centerSelectionInVisibleArea" to match WebKit and AppKit.
* kwq/KWQKHTMLPart.h:
eliminate jumpToSelection(); add centerSelectionInVisibleArea()
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::findString):
use centerSelectionInVisibleArea() instead of jumpToSelection()
(KWQKHTMLPart::centerSelectionInVisibleArea):
renamed from jumpToSelection
(KWQKHTMLPart::advanceToNextMisspelling):
use centerSelectionInVisibleArea() instead of jumpToSelection()
* kwq/WebCoreBridge.h:
eliminate jumpToSelection; add centerSelectionInVisibleArea
* kwq/WebCoreBridge.mm:
eliminate jumpToSelection. We had been implementing both jumpToSelection and
centerSelectionInVisibleArea here, but jumpToSelection now has no more callers.
Revision Changes Path
1.474 +27 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -r1.473 -r1.474
--- ChangeLog 5 Dec 2005 17:40:53 -0000 1.473
+++ ChangeLog 5 Dec 2005 22:01:22 -0000 1.474
@@ -1,3 +1,30 @@
+2005-12-05 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Tim Omernick.
+
+ - WebCore part of fix for
+ <rdar://problem/4365690> Find > Jump to Selection does nothing on plain-text documents (inc. source HTML)
+
+ No behavioral changes here. This patch just eliminates the name "jumpToSelection" in favor of
+ "centerSelectionInVisibleArea" to match WebKit and AppKit.
+
+ * kwq/KWQKHTMLPart.h:
+ eliminate jumpToSelection(); add centerSelectionInVisibleArea()
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::findString):
+ use centerSelectionInVisibleArea() instead of jumpToSelection()
+ (KWQKHTMLPart::centerSelectionInVisibleArea):
+ renamed from jumpToSelection
+ (KWQKHTMLPart::advanceToNextMisspelling):
+ use centerSelectionInVisibleArea() instead of jumpToSelection()
+
+ * kwq/WebCoreBridge.h:
+ eliminate jumpToSelection; add centerSelectionInVisibleArea
+ * kwq/WebCoreBridge.mm:
+ eliminate jumpToSelection. We had been implementing both jumpToSelection and
+ centerSelectionInVisibleArea here, but jumpToSelection now has no more callers.
+
2005-12-05 Vicki Murley <vicki at apple.com>
Reviewed by John.
1.235 +1 -1 WebCore/kwq/KWQKHTMLPart.h
Index: KWQKHTMLPart.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.h,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- KWQKHTMLPart.h 1 Dec 2005 10:32:31 -0000 1.234
+++ KWQKHTMLPart.h 5 Dec 2005 22:01:28 -0000 1.235
@@ -143,7 +143,7 @@
void scheduleHistoryNavigation( int steps );
void scrollToAnchor(const KURL &);
- void jumpToSelection();
+ void centerSelectionInVisibleArea();
QString advanceToNextMisspelling(bool startBeforeSelection = false);
bool scrollOverflow(KWQScrollDirection direction, KWQScrollGranularity granularity);
1.695 +3 -3 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- KWQKHTMLPart.mm 2 Dec 2005 21:13:53 -0000 1.694
+++ KWQKHTMLPart.mm 5 Dec 2005 22:01:29 -0000 1.695
@@ -636,7 +636,7 @@
}
setSelection(SelectionController(resultRange.get(), DOWNSTREAM, VP_UPSTREAM_IF_POSSIBLE));
- jumpToSelection();
+ centerSelectionInVisibleArea();
return true;
}
@@ -910,7 +910,7 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-void KWQKHTMLPart::jumpToSelection()
+void KWQKHTMLPart::centerSelectionInVisibleArea()
{
if (d->m_selection.start().isNotNull()) {
if (selectionStart() && selectionStart()->renderer()) {
@@ -1007,7 +1007,7 @@
misspellingRange->setEnd(chars.range()->startContainer(exception), chars.range()->startOffset(exception), exception);
setSelection(SelectionController(misspellingRange.get(), DOWNSTREAM, VP_UPSTREAM_IF_POSSIBLE));
- jumpToSelection();
+ centerSelectionInVisibleArea();
// Mark misspelling in document.
xmlDocImpl()->addMarker(misspellingRange.get(), DocumentMarker::Spelling);
return result;
1.352 +1 -1 WebCore/kwq/WebCoreBridge.h
Index: WebCoreBridge.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.h,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- WebCoreBridge.h 30 Nov 2005 02:06:33 -0000 1.351
+++ WebCoreBridge.h 5 Dec 2005 22:01:30 -0000 1.352
@@ -296,7 +296,7 @@
- (NSString *)matchLabels:(NSArray *)labels againstElement:(DOMElement *)element;
- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag;
-- (void)jumpToSelection;
+- (void)centerSelectionInVisibleArea;
- (NSString *)advanceToNextMisspelling;
- (NSString *)advanceToNextMisspellingStartingJustBeforeSelection;
1.438 +0 -5 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- WebCoreBridge.mm 5 Dec 2005 17:40:57 -0000 1.437
+++ WebCoreBridge.mm 5 Dec 2005 22:01:30 -0000 1.438
@@ -1170,11 +1170,6 @@
return _part->findString(string, forward, caseFlag, wrapFlag);
}
-- (void)jumpToSelection
-{
- _part->jumpToSelection();
-}
-
- (NSString *)advanceToNextMisspelling
{
return _part->advanceToNextMisspelling().getNSString();
More information about the webkit-changes
mailing list