[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit ef7ad80e3861392d9f9d345f24aa838ca04ffbc2
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 30 17:59:26 2004 +0000

            * WebView.subproj/WebView.m:
            fixed deployment build breakage
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6526 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 186fc68..e7dfc4b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
 2004-04-30  John Sullivan  <sullivan at apple.com>
 
+        * WebView.subproj/WebView.m:
+        fixed deployment build breakage
+        
+2004-04-30  John Sullivan  <sullivan at apple.com>
+
         - more work on getting the font panel to work with editable HTML.
         The font panel in Blot now correctly reflects the first selected font when the
         selection is at least one character long.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index b1a00fb..d6e5919 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2142,12 +2142,6 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
         || [[mainFrame provisionalDataSource] isLoading];
 }
 
-static NSDictionary *_textAttributesFromStyle(DOMCSSStyleDeclaration *style)
-{
-    ERROR("unimplemented");
-    return nil;
-}
-
 static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
 {
     // FIXME: can't get at CSS_PROP_FONT_FAMILY and such from cssproperties.h in WebCore
@@ -2219,7 +2213,6 @@ static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
                 for (; element != lastSelectedElement; element = [iterator nextNode]) {
                     ASSERT([element isKindOfClass:[DOMElement class]]);
                     
-                    DOMCSSStyleDeclaration *otherStyle = [self computedStyleForElement:(DOMElement *)element pseudoElement:nil];
                     NSFont *otherFont = [[self _bridgeForCurrentSelection] renderedFontForNode:element];
                     if (![font isEqual:otherFont]) {
                         onlyOneFontInSelection = NO;

-- 
WebKit Debian packaging