1 files changed, 20 insertions, 7 deletions
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index b2240d9..d27a19c 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -56,6 +56,7 @@
 #import <WebCore/Geolocation.h>
 #import <WebCore/HitTestResult.h>
 #import <WebCore/HTMLNames.h>
+#import <WebCore/Icon.h>
 #import <WebCore/IntRect.h>
 #import <WebCore/Page.h>
 #import <WebCore/PlatformScreen.h>
@@ -439,20 +440,32 @@ IntRect WebChromeClient::windowResizerRect() const
     return enclosingIntRect([m_webView convertRect:rect fromView:nil]);
 }
 
-void WebChromeClient::repaint(const IntRect& rect, bool contentChanged, bool immediate, bool repaintContentOnly)
+void WebChromeClient::invalidateWindow(const IntRect&, bool immediate)
+{
+    if (immediate) {
+        [[m_webView window] displayIfNeeded];
+        [[m_webView window] flushWindowIfNeeded];
+    }
+}
+
+void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
 {
     if ([m_webView _usesDocumentViews])
         return;
-    
-    if (contentChanged)
-        [m_webView setNeedsDisplayInRect:rect];
-    
+
+    [m_webView setNeedsDisplayInRect:rect];
+
     if (immediate) {
         [[m_webView window] displayIfNeeded];
         [[m_webView window] flushWindowIfNeeded];
     }
 }
 
+void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
+{
+    invalidateContentsAndWindow(rect, immediate);
+}
+
 void WebChromeClient::scroll(const IntSize&, const IntRect&, const IntRect&)
 {
 }
@@ -631,9 +644,9 @@ void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void WebChromeClient::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
+void WebChromeClient::chooseIconForFiles(const Vector<String>& filenames, FileChooser* chooser)
 {
-    // FIXME: Move the code of Icon::createIconForFiles() here.
+    chooser->iconLoaded(Icon::createIconForFiles(filenames));
 }
 
 KeyboardUIMode WebChromeClient::keyboardUIMode()