- rolled out last two changes, they seem to cause a performance regression

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView firstRectForCharacterRange:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2194aaeb58a3324f06e1b649805194a830475d04..900d2808a77f64d7ab95bd43046f8815f9db6084 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-09  Maciej Stachowiak  <mjs@apple.com>
+
+        - rolled out last two changes, they seem to cause a performance regression
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView firstRectForCharacterRange:]):
+
 2004-09-09  Maciej Stachowiak  <mjs@apple.com>
 
         - fixed build

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index e7eb4ee191beeb23e41e5446b902b6bca01cbe90..7196e09e7f51fe0a855254fa591d353c85f39e79 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -3834,25 +3834,8 @@ static DOMRange *unionDOMRanges(DOMRange *a, DOMRange *b)
 
 - (NSRect)firstRectForCharacterRange:(NSRange)theRange
 {
-    NSLog(@"location: %d  length: %d\n", theRange.location, theRange.length);
-
-    if (![self hasMarkedText]) {
-        return NSMakeRect(0,0,0,0);
-    }
-
-    WebBridge *bridge = [self _bridge];
-
-    DOMRange *rectRange = [[bridge DOMDocument] createRange];
-    DOMRange *markedRange = [bridge markedTextDOMRange];
-    [rectRange setStart:[markedRange startContainer] :theRange.location];
-    [rectRange setEnd:[markedRange startContainer] :(theRange.location + theRange.length)];
-
-    NSRect resultRect = [self convertRect:[bridge firstRectForDOMRange:rectRange] toView:nil];
-    resultRect.origin = [[self window] convertBaseToScreen:resultRect.origin];
-
-    NSLog(@"(%d,%d) %dx%d\n", (int)resultRect.origin.x, (int)resultRect.origin.y, (int)resultRect.size.width, (int)resultRect.size.height);
-
-    return resultRect;
+    ERROR("TEXTINPUT: firstRectForCharacterRange: not yet implemented");
+    return NSMakeRect(0,0,0,0);
 }
 
 - (NSRange)selectedRange