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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 2042d4b5833db40a3737478d40cc01c3d488a0fc
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 30 23:07:26 2003 +0000

    	Fixed: <rdar://problem/3006869>: show image dimensions in title bar when single image is loaded
    
            Reviewed by rjw.
    
            * English.lproj/Localizable.strings:
            * WebView.subproj/WebImageRepresentation.m:
            (-[WebImageRepresentation title]): return "foo.jpg 50x50 pixels"
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 303f241..c058a7f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-30  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3006869>: show image dimensions in title bar when single image is loaded
+
+        Reviewed by rjw.
+
+        * English.lproj/Localizable.strings:
+        * WebView.subproj/WebImageRepresentation.m:
+        (-[WebImageRepresentation title]): return "foo.jpg 50x50 pixels"
+
 2003-09-30  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3420396.  If a frame targets _top and a URL that contains a fragment (very unusual, it's meaningless for a frameset to contain a named anchor point) the frameset won't be reloaded.  Our normal path is to just scroll to the anchor point.  This is only important because our Help folks oddly depend on the behavior.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 6802242..7604a36 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index 92f58ea..28abea0 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -5,10 +5,12 @@
 
 #import "WebImageRepresentation.h"
 
-#import <WebCore/WebCoreImageRenderer.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebImageRenderer.h>
 #import <WebKit/WebImageRendererFactory.h>
+#import <WebKit/WebLocalizableStrings.h>
+
+#import <WebCore/WebCoreImageRenderer.h>
 
 #import <Foundation/NSURLRequest.h>
 
@@ -76,7 +78,12 @@
 
 - (NSString *)title
 {
-    return nil;
+    NSString *lastPathComponent = [[URL path] lastPathComponent];
+    NSSize size = [image size];
+    if (!NSEqualSizes(size, NSZeroSize)) {
+        return [NSString stringWithFormat:UI_STRING("%@ %dx%d pixels", "window title for a standalone image"), lastPathComponent, (int)size.width, (int)size.height];
+    }
+    return lastPathComponent;
 }
 
 @end

-- 
WebKit Debian packaging