[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1da6e9e08bb5608afc9d78138f17282feb6ed3dc
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 24 19:31:04 2010 +0000

    Removed deprecated methods from the WebHTMLHighlighter private protocol.
    
    Reviewed by Simon Fraser.
    
    * WebCoreSupport/WebChromeClient.mm:
    (WebChromeClient::customHighlightRect): Call -highlightRectForLine:representedNode:
    unconditionally.
    (WebChromeClient::paintCustomHighlight): Call
    -paintHighlightForBox:onLine:behindText:entireLine:representedNode: unconditionally.
    * WebView/WebHTMLViewPrivate.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7a1c656..ba54b45 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Removed deprecated methods from the WebHTMLHighlighter private protocol.
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::customHighlightRect): Call -highlightRectForLine:representedNode:
+        unconditionally.
+        (WebChromeClient::paintCustomHighlight): Call
+        -paintHighlightForBox:onLine:behindText:entireLine:representedNode: unconditionally.
+        * WebView/WebHTMLViewPrivate.h:
+
 2010-10-23  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index ad36e0e..3610896 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -641,9 +641,7 @@ FloatRect WebChromeClient::customHighlightRect(Node* node, const AtomicString& t
 
     WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
     id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
-    if ([(NSObject *)highlighter respondsToSelector:@selector(highlightRectForLine:representedNode:)])
-        return [highlighter highlightRectForLine:lineRect representedNode:kit(node)];
-    return [highlighter highlightRectForLine:lineRect];
+    return [highlighter highlightRectForLine:lineRect representedNode:kit(node)];
 
     END_BLOCK_OBJC_EXCEPTIONS;
 
@@ -661,10 +659,7 @@ void WebChromeClient::paintCustomHighlight(Node* node, const AtomicString& type,
 
     WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
     id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
-    if ([(NSObject *)highlighter respondsToSelector:@selector(paintHighlightForBox:onLine:behindText:entireLine:representedNode:)])
-        [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:behindText entireLine:entireLine representedNode:kit(node)];
-    else
-        [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:behindText entireLine:entireLine];
+    [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:behindText entireLine:entireLine representedNode:kit(node)];
 
     END_BLOCK_OBJC_EXCEPTIONS;
 }
diff --git a/WebKit/mac/WebView/WebHTMLViewPrivate.h b/WebKit/mac/WebView/WebHTMLViewPrivate.h
index 1218efc..c62713f 100644
--- a/WebKit/mac/WebView/WebHTMLViewPrivate.h
+++ b/WebKit/mac/WebView/WebHTMLViewPrivate.h
@@ -46,10 +46,6 @@
 @protocol WebHTMLHighlighter
 - (NSRect)highlightRectForLine:(NSRect)lineRect representedNode:(DOMNode *)node;
 - (void)paintHighlightForBox:(NSRect)boxRect onLine:(NSRect)lineRect behindText:(BOOL)text entireLine:(BOOL)line representedNode:(DOMNode *)node;
-
-// the following methods are deprecated and will be removed once Mail switches to the new methods <rdar://problem/5050528>
-- (NSRect)highlightRectForLine:(NSRect)lineRect;
-- (void)paintHighlightForBox:(NSRect)boxRect onLine:(NSRect)lineRect behindText:(BOOL)text entireLine:(BOOL)line;
 @end
 
 extern const float _WebHTMLViewPrintingMinimumShrinkFactor;

-- 
WebKit Debian packaging