Initial Contribution

10 files changed, 100 insertions, 69 deletions

diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index fcbecf4..48354c1 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -35,7 +35,6 @@
 #import "WebFrameView.h"
 #import "WebHTMLView.h"
 #import "WebHTMLViewPrivate.h"
-#import "WebKitSystemInterface.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebSecurityOriginPrivate.h"
 #import "WebSecurityOriginInternal.h"
@@ -417,12 +416,7 @@ void WebChromeClient::print(Frame* frame)
 void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:frame->document()->securityOrigin()];
-    // FIXME: remove this workaround once shipping Safari has the necessary delegate implemented.
-    if (WKAppVersionCheckLessThan(@"com.apple.Safari", -1, 3.1)) {
-        const unsigned long long defaultQuota = 5 * 1024 * 1024; // 5 megabytes should hopefully be enough to test storage support.
-        [webOrigin setQuota:defaultQuota];
-    } else
-        CallUIDelegate(m_webView, @selector(webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:), kit(frame), webOrigin, (NSString *)databaseName);
+    CallUIDelegate(m_webView, @selector(webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:), kit(frame), webOrigin, (NSString *)databaseName);
     [webOrigin release];
 }
     
diff --git a/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm b/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
index 6b5ad14..8924348 100644
--- a/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -295,7 +295,7 @@ void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const
 
 void WebContextMenuClient::downloadURL(const KURL& url)
 {
-    [m_webView _downloadURL:url];
+    [m_webView _downloadURL:url.getNSURL()];
 }
 
 void WebContextMenuClient::searchWithSpotlight()
diff --git a/WebKit/mac/WebCoreSupport/WebDragClient.mm b/WebKit/mac/WebCoreSupport/WebDragClient.mm
index 2cc7570..7022ad6 100644
--- a/WebKit/mac/WebCoreSupport/WebDragClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebDragClient.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -121,12 +121,11 @@ DragImageRef WebDragClient::createDragImageForLink(KURL& url, const String& titl
 {
     if (!frame)
         return nil;
-    WebHTMLView *htmlView = (WebHTMLView *)[[kit(frame) frameView] documentView];
+    WebHTMLView* htmlView = (WebHTMLView*)[[kit(frame) frameView] documentView];
     NSString *label = 0;
     if (!title.isEmpty())
-        label = title;
-    NSURL *cocoaURL = url;
-    return [htmlView _dragImageForURL:[cocoaURL _web_userVisibleString] withLabel:label];
+        label = (NSString*)title;
+    return [htmlView _dragImageForURL:[url.getNSURL() _web_userVisibleString] withLabel:label];
 }
 
 
diff --git a/WebKit/mac/WebCoreSupport/WebFrameBridge.mm b/WebKit/mac/WebCoreSupport/WebFrameBridge.mm
index 8e0ba51..9440f2d 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameBridge.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameBridge.mm
@@ -738,4 +738,9 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
         [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:text entireLine:line];
 }
 
+- (NSString*)imageTitleForFilename:(NSString*)filename size:(NSSize)size
+{
+    return [NSString stringWithFormat:UI_STRING("%@ %.0f×%.0f pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filename, size.width, size.height];
+}
+
 @end
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
index 12bcc51..88788ee 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
@@ -140,7 +140,8 @@ private:
     virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
     virtual void finishedLoading(WebCore::DocumentLoader*);
     virtual void finalSetupForReplace(WebCore::DocumentLoader*);
-    virtual void updateGlobalHistory(const WebCore::KURL&);
+    virtual void updateGlobalHistoryForStandardLoad(const WebCore::KURL&);
+    virtual void updateGlobalHistoryForReload(const WebCore::KURL&);
     virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
     virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
@@ -199,6 +200,8 @@ private:
     virtual void registerForIconNotification(bool listen);
 
     void deliverArchivedResourcesAfterDelay() const;
+    bool canUseArchivedResource(NSURLRequest *) const;
+    bool canUseArchivedResource(NSURLResponse *) const;
     void deliverArchivedResources(WebCore::Timer<WebFrameLoaderClient>*);
 
     void setOriginalURLForDownload(WebDownload *, const WebCore::ResourceRequest&) const;
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index d77fd89..bde1c5a 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -98,6 +98,7 @@
 #import <WebCore/Widget.h>
 #import <WebKit/DOMElement.h>
 #import <WebKit/DOMHTMLFormElement.h>
+#import <WebKitSystemInterface.h>
 #import <wtf/PassRefPtr.h>
 
 using namespace WebCore;
@@ -425,14 +426,12 @@ void WebFrameLoaderClient::dispatchDidCancelClientRedirect()
         CallFrameLoadDelegate(implementations->didCancelClientRedirectForFrameFunc, webView, @selector(webView:didCancelClientRedirectForFrame:), m_webFrame.get());
 }
 
-void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const KURL& url, double delay, double fireDate)
+void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const KURL& URL, double delay, double fireDate)
 {
     WebView *webView = getWebView(m_webFrame.get());
     WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(webView);
-    if (implementations->willPerformClientRedirectToURLDelayFireDateForFrameFunc) {
-        NSURL *cocoaURL = url;
-        CallFrameLoadDelegate(implementations->willPerformClientRedirectToURLDelayFireDateForFrameFunc, webView, @selector(webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:), cocoaURL, delay, [NSDate dateWithTimeIntervalSince1970:fireDate], m_webFrame.get());
-    }
+    if (implementations->willPerformClientRedirectToURLDelayFireDateForFrameFunc)
+        CallFrameLoadDelegate(implementations->willPerformClientRedirectToURLDelayFireDateForFrameFunc, webView, @selector(webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:), URL.getNSURL(), delay, [NSDate dateWithTimeIntervalSince1970:fireDate], m_webFrame.get());
 }
 
 void WebFrameLoaderClient::dispatchDidChangeLocationWithinPage()
@@ -678,7 +677,7 @@ void WebFrameLoaderClient::setMainFrameDocumentReady(bool ready)
 void WebFrameLoaderClient::startDownload(const ResourceRequest& request)
 {
     // FIXME: Should download full request.
-    WebDownload *download = [getWebView(m_webFrame.get()) _downloadURL:request.url()];
+    WebDownload *download = [getWebView(m_webFrame.get()) _downloadURL:request.url().getNSURL()];
     
     setOriginalURLForDownload(download, request);
 }
@@ -712,15 +711,27 @@ void WebFrameLoaderClient::finalSetupForReplace(DocumentLoader* loader)
     [dataSource(loader) _clearUnarchivingState];
 }
 
-void WebFrameLoaderClient::updateGlobalHistory(const KURL& url)
+// FIXME: <rdar://problem/4880065> - Push Global History into WebCore
+// Once that task is complete, this will go away
+void WebFrameLoaderClient::updateGlobalHistoryForStandardLoad(const KURL& url)
 {
-    NSURL *cocoaURL = url;
-    WebHistoryItem *entry = [[WebHistory optionalSharedHistory] addItemForURL:cocoaURL];
-    const String& pageTitle = core(m_webFrame.get())->loader()->documentLoader()->title();
-    if (!pageTitle.isEmpty())
+    NSURL *nsurl = url.getNSURL();
+    WebHistoryItem *entry = [[WebHistory optionalSharedHistory] addItemForURL:nsurl];
+    String pageTitle = core(m_webFrame.get())->loader()->documentLoader()->title();
+    if (pageTitle.length())
         [entry setTitle:pageTitle];
 }
  
+// FIXME: <rdar://problem/4880065> - Push Global History into WebCore
+// Once that task is complete, this will go away
+void WebFrameLoaderClient::updateGlobalHistoryForReload(const KURL& url)
+{
+    WebHistory *sharedHistory = [WebHistory optionalSharedHistory];
+    WebHistoryItem *item = [sharedHistory itemForURL:url.getNSURL()];
+    if (item)
+        [sharedHistory setLastVisitedTimeInterval:[NSDate timeIntervalSinceReferenceDate] forItem:item];
+}
+
 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const
 {
     WebView* view = getWebView(m_webFrame.get());
@@ -731,32 +742,32 @@ bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const
 
 ResourceError WebFrameLoaderClient::cancelledError(const ResourceRequest& request)
 {
-    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled URL:request.url()];
+    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled URL:request.url().getNSURL()];
 }
     
 ResourceError WebFrameLoaderClient::blockedError(const ResourceRequest& request)
 {
-    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotUseRestrictedPort URL:request.url()];
+    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotUseRestrictedPort URL:request.url().getNSURL()];
 }
 
 ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
 {
-    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotShowURL URL:request.url()];
+    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotShowURL URL:request.url().getNSURL()];
 }
 
 ResourceError WebFrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
 {
-    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];
+    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url().getNSURL()];
 }
 
 ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
 {
-    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:WebKitErrorCannotShowMIMEType URL:response.url()];
+    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:WebKitErrorCannotShowMIMEType URL:response.url().getNSURL()];
 }
 
 ResourceError WebFrameLoaderClient::fileDoesNotExistError(const ResourceResponse& response)
 {
-    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist URL:response.url()];    
+    return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist URL:response.url().getNSURL()];    
 }
 
 bool WebFrameLoaderClient::shouldFallBack(const ResourceError& error)
@@ -777,15 +788,16 @@ bool WebFrameLoaderClient::willUseArchive(ResourceLoader* loader, const Resource
 {
     if (request.url() != originalURL)
         return false;
-
-    WebResource *resource = [dataSource(core(m_webFrame.get())->loader()->activeDocumentLoader()) _archivedSubresourceForURL:originalURL];
+    if (!canUseArchivedResource(request.nsURLRequest()))
+        return false;
+    WebResource *resource = [dataSource(core(m_webFrame.get())->loader()->activeDocumentLoader()) _archivedSubresourceForURL:originalURL.getNSURL()];
     if (!resource)
         return false;
-
+    if (!canUseArchivedResource([resource _response]))
+        return false;
     m_pendingArchivedResources.set(loader, resource);
     // Deliver the resource after a delay because callers don't expect to receive callbacks while calling this method.
     deliverArchivedResourcesAfterDelay();
-
     return true;
 }
 
@@ -930,14 +942,44 @@ PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const Reso
 // Once that task is complete, this will go away
 void WebFrameLoaderClient::setTitle(const String& title, const KURL& URL)
 {
-    NSURL* nsURL = URL;
-    nsURL = [nsURL _webkit_canonicalize];
+    NSURL* nsURL = canonicalURL(URL.getNSURL());
     if(!nsURL)
         return;
     NSString *titleNSString = title;
     [[[WebHistory optionalSharedHistory] itemForURL:nsURL] setTitle:titleNSString];
 }
 
+// The following 2 functions are copied from [NSHTTPURLProtocol _cachedResponsePassesValidityChecks] and modified for our needs.
+// FIXME: It would be nice to eventually to share this logic somehow.
+bool WebFrameLoaderClient::canUseArchivedResource(NSURLRequest *request) const
+{
+    NSURLRequestCachePolicy policy = [request cachePolicy];
+    if (policy == NSURLRequestReturnCacheDataElseLoad)
+        return true;
+    if (policy == NSURLRequestReturnCacheDataDontLoad)
+        return true;
+    if ([request valueForHTTPHeaderField:@"must-revalidate"] != nil)
+        return false;
+    if ([request valueForHTTPHeaderField:@"proxy-revalidate"] != nil)
+        return false;
+    if ([request valueForHTTPHeaderField:@"If-Modified-Since"] != nil)
+        return false;
+    if ([request valueForHTTPHeaderField:@"Cache-Control"] != nil)
+        return false;
+    if ([@"POST" _webkit_isCaseInsensitiveEqualToString:[request HTTPMethod]])
+        return false;
+    return true;
+}
+
+bool WebFrameLoaderClient::canUseArchivedResource(NSURLResponse *response) const
+{
+    if (WKGetNSURLResponseMustRevalidate(response))
+        return false;
+    if (WKGetNSURLResponseCalculatedExpiration(response) - CFAbsoluteTimeGetCurrent() < 1)
+        return false;
+    return true;
+}
+
 void WebFrameLoaderClient::deliverArchivedResourcesAfterDelay() const
 {
     if (m_pendingArchivedResources.isEmpty())
@@ -1072,7 +1114,6 @@ NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& act
         if (keyStateEvent->metaKey())
             modifierFlags |= NSCommandKeyMask;
     }
-    NSURL *originalURL = action.url();
     if (const MouseEvent* mouseEvent = findMouseEvent(event)) {
         IntPoint point(mouseEvent->pageX(), mouseEvent->pageY());
         WebElementDictionary *element = [[WebElementDictionary alloc]
@@ -1082,7 +1123,7 @@ NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& act
             element, WebActionElementKey,
             [NSNumber numberWithInt:mouseEvent->button()], WebActionButtonKey,
             [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-            originalURL, WebActionOriginalURLKey,
+            action.url().getNSURL(), WebActionOriginalURLKey,
             nil];
         [element release];
         return result;
@@ -1090,7 +1131,7 @@ NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& act
     return [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
         [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-        originalURL, WebActionOriginalURLKey,
+        action.url().getNSURL(), WebActionOriginalURLKey,
         nil];
 }
 
@@ -1107,7 +1148,7 @@ PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const KURL& url, const Strin
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     
     return [bridge createChildFrameNamed:name
-                   withURL:url
+                   withURL:url.getNSURL()
                    referrer:referrer 
                    ownerElement:ownerElement
                    allowsScrolling:allowsScrolling
@@ -1122,7 +1163,7 @@ ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const
 {
     WebFrameBridge* bridge = m_webFrame->_private->bridge;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [bridge determineObjectFromMIMEType:mimeType URL:url];
+    return [bridge determineObjectFromMIMEType:mimeType URL:url.getNSURL()];
     END_BLOCK_OBJC_EXCEPTIONS;
     return ObjectContentNone;
 }
@@ -1143,7 +1184,7 @@ Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, Element* element
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     return new Widget([bridge viewForPluginWithFrame:NSMakeRect(0, 0, size.width(), size.height())
-                                                 URL:url
+                                                 URL:url.getNSURL()
                                       attributeNames:nsArray(paramNames)
                                      attributeValues:nsArray(paramValues)
                                             MIMEType:mimeType
@@ -1171,7 +1212,7 @@ Widget* WebFrameLoaderClient::createJavaAppletWidget(const IntSize& size, Elemen
     result->setView([bridge viewForJavaAppletWithFrame:NSMakeRect(0, 0, size.width(), size.height())
                             attributeNames:nsArray(paramNames)
                             attributeValues:nsArray(paramValues)
-                            baseURL:baseURL
+                            baseURL:baseURL.getNSURL()
                             DOMElement:[DOMElement _wrapElement:element]]);    
     END_BLOCK_OBJC_EXCEPTIONS;
     
diff --git a/WebKit/mac/WebCoreSupport/WebImageRendererFactory.m b/WebKit/mac/WebCoreSupport/WebImageRendererFactory.m
index 36e25b7..1219591 100644
--- a/WebKit/mac/WebCoreSupport/WebImageRendererFactory.m
+++ b/WebKit/mac/WebCoreSupport/WebImageRendererFactory.m
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Have to leave this class with these two methods in because versions of Safari up to 3.0.4
-// call the methods from the Debug menu. Once we don't need compatibility with those versions
-// of Safari, we can remove this.
+// Have to leave this class with these two methods in because old versions of
+// Safari call the methods from the Debug menu. Once we don't need compatibility
+// with those old versions of Safari, we can remove this.
 
 @interface WebImageRendererFactory : NSObject
 @end
diff --git a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
index 255e51e..453cd1a 100644
--- a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
@@ -45,7 +45,6 @@
 
 #import <WebKit/DOMCore.h>
 #import <WebKit/DOMExtensions.h>
-#import <WebKit/WebUIDelegate.h>
 
 #import <WebKitSystemInterface.h>
 
@@ -164,6 +163,7 @@ void WebInspectorClient::updateWindowTitle() const
     [preferences setAuthorAndUserStylesEnabled:YES];
     [preferences setJavaScriptEnabled:YES];
     [preferences setAllowsAnimatedImages:YES];
+    [preferences setLoadsImagesAutomatically:YES];
     [preferences setPlugInsEnabled:NO];
     [preferences setJavaEnabled:NO];
     [preferences setUserStyleSheetEnabled:NO];
@@ -175,7 +175,6 @@ void WebInspectorClient::updateWindowTitle() const
     [_webView setPreferences:preferences];
     [_webView setDrawsBackground:NO];
     [_webView setProhibitsMainFrameScrolling:YES];
-    [_webView setUIDelegate:self];
 
     [preferences release];
 
@@ -490,7 +489,6 @@ void WebInspectorClient::updateWindowTitle() const
 }
 
 #pragma mark -
-#pragma mark Animation delegate
 
 - (void)animationDidEnd:(NSAnimation*)animation
 {
@@ -504,13 +502,6 @@ void WebInspectorClient::updateWindowTitle() const
     }
 }
 
-#pragma mark -
-#pragma mark UI delegate
-
-- (unsigned)webView:(WebView *)sender dragDestinationActionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
-{
-    return WebDragDestinationActionNone;
-}
 
 #pragma mark -
 
diff --git a/WebKit/mac/WebCoreSupport/WebSystemInterface.m b/WebKit/mac/WebCoreSupport/WebSystemInterface.m
index 2e8376c..e20adfd 100644
--- a/WebKit/mac/WebCoreSupport/WebSystemInterface.m
+++ b/WebKit/mac/WebCoreSupport/WebSystemInterface.m
@@ -64,18 +64,24 @@ void InitWebCoreSystemInterface(void)
     INIT(GetExtensionsForMIMEType);
     INIT(GetFontInLanguageForCharacter);
     INIT(GetFontInLanguageForRange);
+    INIT(GetFontMetrics);
     INIT(GetGlyphTransformedAdvances);
     INIT(GetGlyphVectorFirstRecord);
     INIT(GetGlyphVectorNumGlyphs);
     INIT(GetGlyphVectorRecordSize);
     INIT(GetMIMETypeForExtension);
     INIT(GetNSFontATSUFontId);
+    INIT(GetNSURLResponseCalculatedExpiration);
     INIT(GetNSURLResponseLastModifiedDate);
+    INIT(GetNSURLResponseMustRevalidate);
     INIT(GetPreferredExtensionForMIMEType);
     INIT(GetWheelEventDeltas);
     INIT(InitializeGlyphVector);
+    INIT(NSURLProtocolClassForReqest);
+    INIT(PathFromFont);
     INIT(PopupMenu);
     INIT(ReleaseStyleGroup);
+    INIT(SecondsSinceLastInputEvent);
     INIT(SetCGFontRenderingMode);
     INIT(SetDragImage);
     INIT(SetNSURLConnectionDefersCallbacks);
@@ -86,14 +92,11 @@ void InitWebCoreSystemInterface(void)
     INIT(SignalCFReadStreamEnd);
     INIT(SignalCFReadStreamError);
     INIT(SignalCFReadStreamHasBytes);
+    INIT(SupportsMultipartXMixedReplace);
     INIT(QTMovieDataRate);
     INIT(QTMovieMaxTimeLoaded);
     INIT(QTMovieViewSetDrawSynchronously);
 
-#ifdef BUILDING_ON_TIGER
-    INIT(GetFontMetrics);
-    INIT(SupportsMultipartXMixedReplace);
-#endif
-
+    
     didInit = true;
 }
diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index c524b4b..e7174fe 100644
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -479,9 +479,4 @@
     return UI_STRING("Unknown", "Unknown filesize FTP directory listing item");
 }
 
-- (NSString*)imageTitleForFilename:(NSString*)filename size:(NSSize)size
-{
-    return [NSString stringWithFormat:UI_STRING("%@ %.0f×%.0f pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filename, size.width, size.height];
-}
-
 @end